git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 45ab460 b436825)
Merge branch 'bw/diff3-conflict-style'
authorPratyush Yadav <redacted>
Thu, 3 Oct 2019 21:57:53 +0000 (03:27 +0530)
committerPratyush Yadav <redacted>
Thu, 3 Oct 2019 21:57:53 +0000 (03:27 +0530)
commit69fdb922ad1364a2752e1e444407f2aebd089ddf
tree006cff6a346a28bf0c63231bde445490de8ab5fetree | snapshot
parent45ab460d4ad23e06f81a1cc9ed10efff6c612297commit | diff
parentb436825b9bf3c606bb684e41f426fa3d0c088328commit | diff
Merge branch 'bw/diff3-conflict-style'

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
git-gui.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT