2011-08-18 11:23:46 +04:00
|
|
|
diff_cmd () {
|
2013-01-25 13:43:52 +04:00
|
|
|
"$merge_tool_path" -R -f -d \
|
|
|
|
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
|
2011-08-18 11:23:46 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
merge_cmd () {
|
|
|
|
case "$1" in
|
2020-07-30 00:31:13 +03:00
|
|
|
*vimdiff)
|
2011-08-18 11:23:46 +04:00
|
|
|
if $base_present
|
|
|
|
then
|
2016-01-29 05:18:14 +03:00
|
|
|
"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
|
|
|
|
"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
|
2011-08-18 11:23:46 +04:00
|
|
|
else
|
|
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
|
|
fi
|
|
|
|
;;
|
2021-02-14 05:28:40 +03:00
|
|
|
*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"
|
|
|
|
;;
|
2020-07-30 00:31:13 +03:00
|
|
|
*vimdiff2)
|
2011-08-18 11:23:46 +04:00
|
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
|
|
;;
|
2020-07-30 00:31:13 +03:00
|
|
|
*vimdiff3)
|
2014-04-21 04:24:20 +04:00
|
|
|
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
|
|
|
|
;;
|
2011-08-18 11:23:46 +04:00
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
|
|
|
translate_merge_tool_path() {
|
|
|
|
case "$1" in
|
2020-07-30 00:31:13 +03:00
|
|
|
nvimdiff*)
|
|
|
|
echo nvim
|
|
|
|
;;
|
|
|
|
gvimdiff*)
|
2011-08-18 11:23:46 +04:00
|
|
|
echo gvim
|
|
|
|
;;
|
2020-07-30 00:31:13 +03:00
|
|
|
vimdiff*)
|
2011-08-18 11:23:46 +04:00
|
|
|
echo vim
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
2016-11-29 12:38:20 +03:00
|
|
|
|
|
|
|
exit_code_trustable () {
|
|
|
|
true
|
|
|
|
}
|
2020-07-30 00:31:12 +03:00
|
|
|
|
|
|
|
list_tool_variants () {
|
2020-07-30 00:31:13 +03:00
|
|
|
for prefix in '' g n; do
|
2021-02-14 05:28:40 +03:00
|
|
|
for suffix in '' 1 2 3; do
|
2020-07-30 00:31:12 +03:00
|
|
|
echo "${prefix}vimdiff${suffix}"
|
|
|
|
done
|
|
|
|
done
|
|
|
|
}
|