mergetool: support delete/delete conflicts
authorDavid Aguilar <davvid@gmail.com>
Thu, 10 Mar 2016 07:13:58 +0000 (23:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 22:07:13 +0000 (14:07 -0800)
commitfaaab8d...71633fc8d98f58f02862f1d0bfa988f7
treee7640a2...5227c1cf97bf49298c03776d6a8e529dcopy hash to clipboard (tree)
parent326e5bc...1eecf73234ead29636207bc516573e79copy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh