]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: faaab8d) | patch
mergetool: honor tempfile configuration when resolving delete conflicts
authorDavid Aguilar <davvid@gmail.com>
Thu, 10 Mar 2016 07:13:59 +0000 (23:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 22:07:57 +0000 (14:07 -0800)
commita2986045e3da24c850da03eaf2f2e2a56f8d4fff
tree8b2750e30dceb0fcd1b28522c7923a6397c12e74tree | snapshot
parentfaaab8d571633fc8d98f58f02862f1d0bfa988f7commit | diff
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>
git-mergetool.sh diff | blob | blame | history
t/t7610-mergetool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.