mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![David Aguilar](/assets/img/avatar_default.png)
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>
49 lines
890 B
Plaintext
49 lines
890 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" -R -f -d \
|
|
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
case "$1" in
|
|
gvimdiff|vimdiff)
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
|
|
"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
|
|
else
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
fi
|
|
;;
|
|
gvimdiff2|vimdiff2)
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
;;
|
|
gvimdiff3|vimdiff3)
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -f -d -c 'hid | hid | hid' \
|
|
"$LOCAL" "$REMOTE" "$BASE" "$MERGED"
|
|
else
|
|
"$merge_tool_path" -f -d -c 'hid | hid' \
|
|
"$LOCAL" "$REMOTE" "$MERGED"
|
|
fi
|
|
;;
|
|
esac
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
case "$1" in
|
|
gvimdiff|gvimdiff2|gvimdiff3)
|
|
echo gvim
|
|
;;
|
|
vimdiff|vimdiff2|vimdiff3)
|
|
echo vim
|
|
;;
|
|
esac
|
|
}
|
|
|
|
exit_code_trustable () {
|
|
true
|
|
}
|