| commit | 7ef503bf3c0fd3f5f30f907fa724eb9c5398b945 | |
| author | Bert Wesarg <bert.wesarg@googlemail.com> | |
| Wed, 25 May 2011 16:59:34 +0000 (25 18:59 +0200) | ||
| committer | Bert Wesarg <bert.wesarg@googlemail.com> | |
| Fri, 2 May 2014 13:05:47 +0000 (2 15:05 +0200) | ||
| tree | 1a01832dcd9c731bbe65cde70fec034538b825ce | treesnapshot (tar.gz zip) |
| parent | 73038128974e2f06939f796546d7fb632a50617f | commitdiff |
git-gui: support for diff3 conflict style
This adds highlight support for the diff3 conflict style.
The common pre-image will be reversed to --, because it has been removed
and either replaced with our or their side.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
This adds highlight support for the diff3 conflict style.
The common pre-image will be reversed to --, because it has been removed
and either replaced with our or their side.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
| git-gui.sh | diffblobblamehistory | |
| lib/diff.tcl | diffblobblamehistory |