From: Pratyush Yadav Date: Thu, 3 Oct 2019 21:57:53 +0000 (+0530) Subject: Merge branch 'bw/diff3-conflict-style' X-Git-Tag: v2.24.0~4^2~2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=69fdb922ad1364a2752e1e444407f2aebd089ddf;p=thirdparty%2Fgit.git 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 --- 69fdb922ad1364a2752e1e444407f2aebd089ddf