diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:02 -0700 |
| commit | e094194f08c3d7f3d9ea1714d34ee20ba82f6851 (patch) | |
| tree | 95d250070f71ea960aba8dd8056c8ebc6ad2c02f /diff.c | |
| parent | Merge branch 'sb/submodule-parallel-update' (diff) | |
| parent | mergetool: honor tempfile configuration when resolving delete conflicts (diff) | |
| download | git-e094194f08c3d7f3d9ea1714d34ee20ba82f6851.tar.gz git-e094194f08c3d7f3d9ea1714d34ee20ba82f6851.zip | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions