Sublime Forum

Feature request: Show common ancestor in merge three pane window

#1

So I use the git diff3 style and its incredible at seeing what a line of code looked like prior to a conflict arising on it. Whats great is Sublimemerge shows the diff3 style in the normal window before doing a “resolve” as I have git already configured to show that. But clicking on resolve shows what nearly every other git merge tool shows which is the left pane being “theirs” the right being “yours” and the middle the resolved. I would like to request the ability to show the common ancestor in this window as well as I believe that would be incredibly useful. Maybe it’d be great to show it as a fourth pane that can be toggled or shows automatically if using diff3 in git or maybe theres a better way to show (hovering over the conflict line?). I haven’t seen a single other git mergetool show this but it’s the one feature that I feel would be amazing.

0 Likes

#2

You can click the up the top where it says ‘Merged’ to show the common ancestor, to press Ctrl+0 (Cmd+0 on Mac)

1 Like

#3

Nice! Thanks! Guess that’s a hidden feature? Wouldn’t have thought to do that…

0 Likes