| commit | 517736ffcf7e0a81cef938987b4cc4ed82b3408f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Apr 2016 01:57:47 +0000 (14 18:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Apr 2016 01:57:47 +0000 (14 18:57 -0700) | ||
| tree | 0122a67b9b27001af213c1e6c194307d4a97005e | treesnapshot (tar.gz zip) |
| parent | 237e6db5c08b095d84d352206e6dcd332fbfca5a | commitdiff |
| parent | a2986045e3da24c850da03eaf2f2e2a56f8d4fff | commitdiff |
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
"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