]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 237e6db a298604)
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)
commit517736ffcf7e0a81cef938987b4cc4ed82b3408f
tree0122a67b9b27001af213c1e6c194307d4a97005etree | snapshot
parent237e6db5c08b095d84d352206e6dcd332fbfca5acommit | diff
parenta2986045e3da24c850da03eaf2f2e2a56f8d4fffcommit | diff
Merge branch 'da/mergetool-delete-delete-conflict' into maint

"git mergetool" did not work well with conflicts that both sides
deleted.

* da/mergetool-delete-delete-conflict:
  mergetool: honor tempfile configuration when resolving delete conflicts
  mergetool: support delete/delete conflicts
Unnamed repository; edit this file 'description' to name the repository.