mergetool: honor tempfile configuration when resolving delete conflicts
authorDavid Aguilar <davvid@gmail.com>
Thu, 10 Mar 2016 07:13:59 +0000 (23:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 22:07:57 +0000 (14:07 -0800)
commita298604...e3da24c850da03eaf2f2e2a56f8d4fff
tree8b2750e...0dceb0fcd1b28522c7923a6397c12e74copy hash to clipboard (tree)
parentfaaab8d...71633fc8d98f58f02862f1d0bfa988f7copy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh