![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Paul Mackerras <paulus@samba.org> | |
| Fri, 29 Jul 2005 14:23:03 +0000 (09:23 -0500) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Fri, 29 Jul 2005 14:23:03 +0000 (09:23 -0500) | ||
| commit | c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b | |
| tree | 13456d48d88a17ba647acadc0fafe7c4fe5d00e2 | tree | snapshot |
| parent | 73b6a6cbda9cd568e2544f2c7dd6c217e369cc37 | commit | diff |
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.
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.
| gitk | diff | blob | history |