diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:47 -0700 |
| commit | 517736ffcf7e0a81cef938987b4cc4ed82b3408f (patch) | |
| tree | 0122a67b9b27001af213c1e6c194307d4a97005e /http-push.c | |
| parent | 237e6db5c08b095d84d352206e6dcd332fbfca5a (diff) | |
| parent | a2986045e3da24c850da03eaf2f2e2a56f8d4fff (diff) | |
| download | git-517736ffcf7e0a81cef938987b4cc4ed82b3408f.tar.gz git-517736ffcf7e0a81cef938987b4cc4ed82b3408f.tar.xz | |
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
Diffstat (limited to 'http-push.c')
0 files changed, 0 insertions, 0 deletions