mirror of
https://github.com/git/git.git
synced 2024-05-13 04:06:10 +02:00
Merge branch 'sh/mergetools-vimdiff1' into next
Mergetools update. * sh/mergetools-vimdiff1: mergetools/vimdiff: add vimdiff1 merge tool variant
This commit is contained in:
commit
dbd4c6684c
|
@ -15,6 +15,17 @@ merge_cmd () {
|
||||||
"$LOCAL" "$MERGED" "$REMOTE"
|
"$LOCAL" "$MERGED" "$REMOTE"
|
||||||
fi
|
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)
|
*vimdiff2)
|
||||||
"$merge_tool_path" -f -d -c 'wincmd l' \
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
||||||
"$LOCAL" "$MERGED" "$REMOTE"
|
"$LOCAL" "$MERGED" "$REMOTE"
|
||||||
|
@ -52,7 +63,7 @@ exit_code_trustable () {
|
||||||
|
|
||||||
list_tool_variants () {
|
list_tool_variants () {
|
||||||
for prefix in '' g n; do
|
for prefix in '' g n; do
|
||||||
for suffix in '' 2 3; do
|
for suffix in '' 1 2 3; do
|
||||||
echo "${prefix}vimdiff${suffix}"
|
echo "${prefix}vimdiff${suffix}"
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue