summaryrefslogtreecommitdiff
path: root/t/lib-git-p4.sh
diff options
context:
space:
mode:
authorLibravatar Pratyush Yadav <me@yadavpratyush.com>2019-10-04 03:27:53 +0530
committerLibravatar Pratyush Yadav <me@yadavpratyush.com>2019-10-04 03:27:53 +0530
commit69fdb922ad1364a2752e1e444407f2aebd089ddf (patch)
tree006cff6a346a28bf0c63231bde445490de8ab5fe /t/lib-git-p4.sh
parentMerge branch 'js/git-bash-if-available' (diff)
parentgit-gui: support for diff3 conflict style (diff)
downloadtgif-69fdb922ad1364a2752e1e444407f2aebd089ddf.tar.xz
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
Diffstat (limited to 't/lib-git-p4.sh')
0 files changed, 0 insertions, 0 deletions