aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2016-11-29 01:38:20 -0800
committerJunio C Hamano <gitster@pobox.com>2016-11-29 10:57:41 -0800
commit2967284456e9053ee8dd26148c22432a4776a3dc (patch)
treed32ab9d80cd80b9d63531c6c3a9e1818d0ffbde8 /mergetools
parent7c10605d2ccf499af6136e993cf248892be39168 (diff)
downloadgit-2967284456e9053ee8dd26148c22432a4776a3dc.tar.gz
git-2967284456e9053ee8dd26148c22432a4776a3dc.tar.xz
mergetools/vimdiff: trust Vim's exit code
Allow vimdiff users to signal that they do not want to use the result of a merge by exiting with ":cquit", which tells Vim to exit with an error code. This is better than the current behavior because it allows users to directly flag that the merge is bad, using a standard Vim feature, rather than relying on a timestamp heuristic that is unforgiving to users that save in-progress merge files. The original behavior can be restored by configuring mergetool.vimdiff.trustExitCode to false. Reported-by: Dun Peal <dunpealer@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/vimdiff4
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index a841ffdb4..10d86f3e1 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -42,3 +42,7 @@ translate_merge_tool_path() {
;;
esac
}
+
+exit_code_trustable () {
+ true
+}