David Aguilar a2986045e3 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>

2016-03-10 14:07:57 -08:00

9.5 KiB

Executable File

Raw Blame History

View Raw