]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45ab460 b436825)
Merge branch 'bw/diff3-conflict-style'
authorPratyush Yadav <me@yadavpratyush.com>
Thu, 3 Oct 2019 21:57:53 +0000 (03:27 +0530)
committerPratyush Yadav <me@yadavpratyush.com>
Thu, 3 Oct 2019 21:57:53 +0000 (03:27 +0530)
git-gui now highlights diff3 style conflicts properly. As an auxiliary
change, querying a path's attribute is done via the existing interface
instead of hand-rolling the code.

* bw/diff3-conflict-style:
  git-gui: support for diff3 conflict style
  git-gui: use existing interface to query a path's attribute

1  2 
git-gui.sh patch | diff1 | diff2 | blob | history

diff --cc git-gui.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.