Commit 29672844 authored by David Aguilar's avatar David Aguilar Committed by Junio C Hamano

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's avatarDun Peal <dunpealer@gmail.com>
Signed-off-by: David Aguilar's avatarDavid Aguilar <davvid@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 7c10605d
...@@ -42,3 +42,7 @@ translate_merge_tool_path() { ...@@ -42,3 +42,7 @@ translate_merge_tool_path() {
;; ;;
esac esac
} }
exit_code_trustable () {
true
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment