Bert Wesarg b436825b9b 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>

2019-10-04 03:26:15 +05:30

23 KiB

Raw Blame History

View Raw