Stefan Haller wrote:
Sometimes it's desirable to see what changes were introduced by a
merge commit, rather than how conflicts were resolved. This adds
a checkbox which, when turned on, makes gitk show the equivalent
of "git show --first-parent <commit>" for merge commits.
To be clear: this is a diff option (like -m but limited to one
parent), not a history traversal option, right?
I realize this conflicts with Thomas Rast's recent patch to
add a word-diff dropdown box; things are fighting for space
in the diff pane header...
Any ideas for addressing the space shortage?