Paul Mackerras c8a4acbf4a Improve the merge display when the result differs from all parents. ... Now we see if the result is quite similar to one of the parents, and if it is, display the result as a diff from that parent. If the result is similar to more than one parent, pick the one that it's most similar to.		2005-07-29 09:23:03 -05:00
gitk	Improve the merge display when the result differs from all parents.	2005-07-29 09:23:03 -05:00