diff options
| author |  David Aguilar <davvid@gmail.com> | 2016-03-09 23:13:59 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-10 14:07:57 -0800 |
| commit | a2986045e3da24c850da03eaf2f2e2a56f8d4fff (patch) | |
| tree | 8b2750e30dceb0fcd1b28522c7923a6397c12e74 /fast-import.c | |
| parent | mergetool: support delete/delete conflicts (diff) | |
| download | tgif-a2986045e3da24c850da03eaf2f2e2a56f8d4fff.tar.xz | |
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 'fast-import.c')
0 files changed, 0 insertions, 0 deletions