]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c3b57dc) | patch
git-gui: support for diff3 conflict style
authorBert Wesarg <bert.wesarg@googlemail.com>
Wed, 2 Oct 2019 07:36:02 +0000 (09:36 +0200)
committerPratyush Yadav <me@yadavpratyush.com>
Thu, 3 Oct 2019 21:56:15 +0000 (03:26 +0530)
commitb436825b9bf3c606bb684e41f426fa3d0c088328
treec84247bc84f729e0e84e19fbb874971b1162ee3btree | snapshot
parentc3b57dc2a0fe944b3c6c9c11b4ce0700c77f190ccommit | 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>
git-gui.sh diff | blob | blame | history
lib/diff.tcl diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.