summaryrefslogtreecommitdiff
path: root/t/t4034
diff options
context:
space:
mode:
authorLibravatar Bert Wesarg <bert.wesarg@googlemail.com>2019-10-02 09:36:02 +0200
committerLibravatar Pratyush Yadav <me@yadavpratyush.com>2019-10-04 03:26:15 +0530
commitb436825b9bf3c606bb684e41f426fa3d0c088328 (patch)
treec84247bc84f729e0e84e19fbb874971b1162ee3b /t/t4034
parentgit-gui: use existing interface to query a path's attribute (diff)
downloadtgif-b436825b9bf3c606bb684e41f426fa3d0c088328.tar.xz
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>
Diffstat (limited to 't/t4034')
0 files changed, 0 insertions, 0 deletions