Skip to content

GitLab

Open
Created by Bugzilla@bugzilla-migration💬Reporter

[BZ#676104] Show diff between common ancestor and conflicting children

Submitted by Sami Wagiaalla

Link to original bug (#676104)

Description

I have diff3 enabled in my .gitconfig:

[merge] conflictstyle=diff3

Which meld seems to be handling correctly. It would be really cool however if meld would show me what has changed remotely that is causing the conflict.

For example in the attached image I had moved a chunk of code to its own function. Someone changed this code remotely but I could not tell what the change was even though I was looking at the remote version(left) vs the common ancestor(center). When I copied the code to files ran diff I found this:

  • setProjectRoot(FedoraPackagerUtils.getProjectRoot(eventResource));
  • setProjectRoot(FedoraPackagerUtils
  •             .getProjectRoot(eventResource));

:)

If meld highlighted this in a darker red that would be great! You do this in the blue non conflicting changes.

Thanks