diff options
author | David Aguilar <davvid@gmail.com> | 2016-11-29 12:38:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 21:57:41 +0300 |
commit | 2967284456e9053ee8dd26148c22432a4776a3dc (patch) | |
tree | d32ab9d80cd80b9d63531c6c3a9e1818d0ffbde8 /generate-cmdlist.sh | |
parent | 7c10605d2ccf499af6136e993cf248892be39168 (diff) |
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 'generate-cmdlist.sh')
0 files changed, 0 insertions, 0 deletions