gitk: showing onging merge as such ?

From: Yann Dirson <hidden>
Date: 2016-06-15 22:46:43

While resolving a conflicted merge, I wondered if there was any reason why
gitk does not show that we are indeed doing a merge, by showing the staged
contents as a merge commit if MERGE_HEAD is found.

Is there any reason why we would not do this ?

I had a quick try at how this could be done, here it is.  The diff is not
yet displayed as combined.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help