| commit | 8b07dca18a498c5900edc717d216e841d6c15dc9 | |
| author | Paul Mackerras <paulus@samba.org> | |
| Sun, 2 Nov 2008 11:34:47 +0000 (2 22:34 +1100) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Sun, 2 Nov 2008 11:34:47 +0000 (2 22:34 +1100) | ||
| tree | 837030a96f2f277562fd175ae67b10479e0411e0 | treesnapshot (tar.gz zip) |
| parent | e3e901bece93417392faa3dd7833d69271cf74f6 | commitdiff |
gitk: Unify handling of merge diffs with normal 2-way diffs
This adds code to getblobdiffline to make it able to recognize and
display merge diffs (i.e. N-way diffs for N >= 3) as well as normal
two-way diffs. This means that it can also correctly display the
3-way diff of the local changes when the git repository is in the
middle of a merge with conflicts.
This also removes getmergediffline and changes mergediff to invoke
getblobdiffline rather than getmergediffline.
Signed-off-by: Paul Mackerras <paulus@samba.org>
This adds code to getblobdiffline to make it able to recognize and
display merge diffs (i.e. N-way diffs for N >= 3) as well as normal
two-way diffs. This means that it can also correctly display the
3-way diff of the local changes when the git repository is in the
middle of a merge with conflicts.
This also removes getmergediffline and changes mergediff to invoke
getblobdiffline rather than getmergediffline.
Signed-off-by: Paul Mackerras <paulus@samba.org>
| gitk | diffblobblamehistory |