Merge branch 'da/mergetool-delete-delete-conflict' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)
commit517736f...cf7e0a81cef938987b4cc4ed82b3408f
tree0122a67...9b27001af213c1e6c194307d4a97005ecopy hash to clipboard (tree)
parent237e6db...c08b095d84d352206e6dcd332fbfca5acopy hash to clipboard (diff)
parenta298604...e3da24c850da03eaf2f2e2a56f8d4fffcopy hash to clipboard (diff)