diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-07-29 14:23:03 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-07-29 14:23:03 (GMT) |
| commit | c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b (patch) | |
| tree | 13456d48d88a17ba647acadc0fafe7c4fe5d00e2 /pkt-line.h | |
| parent | 73b6a6cbda9cd568e2544f2c7dd6c217e369cc37 (diff) | |
| download | git-c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b.zip git-c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b.tar.gz git-c8a4acbf4a7b0f9da3e320877b2b2d12cd58700b.tar.bz2 | |
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.
Diffstat (limited to 'pkt-line.h')
0 files changed, 0 insertions, 0 deletions