f4609b896f
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
59 lines
986 B
Text
59 lines
986 B
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
|
|
;;
|
|
*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 '' 2 3; do
|
|
echo "${prefix}vimdiff${suffix}"
|
|
done
|
|
done
|
|
}
|