Issue #2201 resolved

resolve window: add "diff to common ancestor" buttons

Ike Casteleyn
created an issue

When I resolve a conflict, I find it useful to have the diff against the common ancestor to better see what was changed.

To explain better see the graph.png attachement.

When I would merge these 2 branches and I get a conflict on readme.txt, I would want these 2 buttons

  • diff of rev10 to rev 5 on default for readme.txt (all changes to readme.txt done on default branch since common ancestor)

  • diff of rev9 to rev 5 on branchX for readme.txt (all changes to readme.txt done on branchX since common ancestor)

Comments (3)

  1. Yuya Nishihara

    resolve: add "diff to common ancestor" cmenu actions in resolve window (fixes #2201)

    In the resolve window 2 contextmenu actions have been added for unresolved files "Diff Local to Ancestor": shows the diff between local and the common ancestor "Diff Other to Ancestor": shows the diff between other and the common ancestor

    → <<cset d8916c210dfb>>

  2. Log in to comment