| commit | b436825b9bf3c606bb684e41f426fa3d0c088328 | [log] [tgz] |
|---|---|---|
| author | Bert Wesarg <bert.wesarg@googlemail.com> | Wed Oct 02 09:36:02 2019 +0200 |
| committer | Pratyush Yadav <me@yadavpratyush.com> | Fri Oct 04 03:26:15 2019 +0530 |
| tree | c84247bc84f729e0e84e19fbb874971b1162ee3b | |
| parent | c3b57dc2a0fe944b3c6c9c11b4ce0700c77f190c [diff] |
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 replaced with ours or theirs side respectively. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>