projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
c8a4acb
)
Improve the merge display when the result differs from all parents.
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)
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.
No differences found