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