| commit | e094194f08c3d7f3d9ea1714d34ee20ba82f6851 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Apr 2016 18:39:02 +0000 (6 11:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Apr 2016 18:39:02 +0000 (6 11:39 -0700) | ||
| tree | 95d250070f71ea960aba8dd8056c8ebc6ad2c02f | treesnapshot (tar.gz zip) |
| parent | bdebbeb3346e9867005947aff356b99a7358e5ab | commitdiff |
| parent | a2986045e3da24c850da03eaf2f2e2a56f8d4fff | commitdiff |
Merge branch 'da/mergetool-delete-delete-conflict'
"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