mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
30bb8088af
This adds yet another vimdiff/gvimdiff variant and presents conflicts as a two-way diff between 'LOCAL' and 'REMOTE'. 'MERGED' is not opened which deviates from the norm so usage text is echoed as a Vim message on startup that instructs the user with how to proceed and how to abort. Vimdiff is well-suited to two-way diffs so this is an option for a more simple, more streamlined conflict resolution. For example: it is difficult to communicate differences across more than two files using only syntax highlighting; default vimdiff commands to get and put changes between buffers do not need the user to manually specify a source or destination buffer when only using two buffers. Like other merge tools that directly compare 'LOCAL' with 'REMOTE', this tool will benefit when paired with the new `mergetool.hideResolved` setting. Signed-off-by: Seth House <seth@eseth.com> Tested-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
70 lines
1.2 KiB
Text
70 lines
1.2 KiB
Text
diff_cmd () {
|
|
"$merge_tool_path" -R -f -d \
|
|
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
case "$1" in
|
|
*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
|
|
;;
|
|
*vimdiff1)
|
|
"$merge_tool_path" -f -d \
|
|
-c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
|
|
"$LOCAL" "$REMOTE"
|
|
ret="$?"
|
|
if test "$ret" -eq 0
|
|
then
|
|
cp -- "$LOCAL" "$MERGED"
|
|
fi
|
|
return "$ret"
|
|
;;
|
|
*vimdiff2)
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
;;
|
|
*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
|
|
nvimdiff*)
|
|
echo nvim
|
|
;;
|
|
gvimdiff*)
|
|
echo gvim
|
|
;;
|
|
vimdiff*)
|
|
echo vim
|
|
;;
|
|
esac
|
|
}
|
|
|
|
exit_code_trustable () {
|
|
true
|
|
}
|
|
|
|
list_tool_variants () {
|
|
for prefix in '' g n; do
|
|
for suffix in '' 1 2 3; do
|
|
echo "${prefix}vimdiff${suffix}"
|
|
done
|
|
done
|
|
}
|