2011-08-18 07:23:46 +00:00
|
|
|
diff_cmd () {
|
2013-01-25 09:43:52 +00:00
|
|
|
"$merge_tool_path" -R -f -d \
|
|
|
|
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
|
2011-08-18 07:23:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
merge_cmd () {
|
|
|
|
touch "$BACKUP"
|
|
|
|
case "$1" in
|
|
|
|
gvimdiff|vimdiff)
|
|
|
|
if $base_present
|
|
|
|
then
|
2016-01-29 02:18:14 +00:00
|
|
|
"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
|
|
|
|
"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
|
2011-08-18 07:23:46 +00:00
|
|
|
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"
|
|
|
|
;;
|
2014-04-21 00:24:20 +00:00
|
|
|
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
|
|
|
|
;;
|
2011-08-18 07:23:46 +00:00
|
|
|
esac
|
|
|
|
check_unchanged
|
|
|
|
}
|
|
|
|
|
|
|
|
translate_merge_tool_path() {
|
|
|
|
case "$1" in
|
2014-04-21 00:24:20 +00:00
|
|
|
gvimdiff|gvimdiff2|gvimdiff3)
|
2011-08-18 07:23:46 +00:00
|
|
|
echo gvim
|
|
|
|
;;
|
2014-04-21 00:24:20 +00:00
|
|
|
vimdiff|vimdiff2|vimdiff3)
|
2011-08-18 07:23:46 +00:00
|
|
|
echo vim
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|