diff options
| author | David Aguilar <davvid@gmail.com> | 2016-03-10 08:13:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 23:07:57 +0100 |
| commit | a2986045e3da24c850da03eaf2f2e2a56f8d4fff (patch) | |
| tree | 8b2750e30dceb0fcd1b28522c7923a6397c12e74 /t/t1508-at-combinations.sh | |
| parent | mergetool: support delete/delete conflicts (diff) | |
| download | git-a2986045e3da24c850da03eaf2f2e2a56f8d4fff.tar.xz git-a2986045e3da24c850da03eaf2f2e2a56f8d4fff.zip | |
mergetool: honor tempfile configuration when resolving delete conflicts
Teach resolve_deleted_merge() to honor the mergetool.keepBackup and
mergetool.keepTemporaries configuration knobs.
This ensures that the worktree is kept pristine when resolving deletion
conflicts with the variables both set to false.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1508-at-combinations.sh')
0 files changed, 0 insertions, 0 deletions