| commit | 69fdb922ad1364a2752e1e444407f2aebd089ddf | [log] [tgz] |
|---|---|---|
| author | Pratyush Yadav <me@yadavpratyush.com> | Fri Oct 04 03:27:53 2019 +0530 |
| committer | Pratyush Yadav <me@yadavpratyush.com> | Fri Oct 04 03:27:53 2019 +0530 |
| tree | 006cff6a346a28bf0c63231bde445490de8ab5fe | |
| parent | 45ab460d4ad23e06f81a1cc9ed10efff6c612297 [diff] | |
| parent | b436825b9bf3c606bb684e41f426fa3d0c088328 [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