Improve the merge display when the result differs from all parents.
tree13456d48d88a17ba647acadc0fafe7c4fe5d00e2
-rwxr-xr-x 79854 gitk