mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-28 15:45:10 +02:00
Code

Merge branch 'sh/mergetools-vimdiff1' into next 

Mergetools update.

* sh/mergetools-vimdiff1:
  mergetools/vimdiff: add vimdiff1 merge tool variant
This commit is contained in:
Junio C Hamano 2021-02-24 15:31:43 -08:00
parent 5315e84c47 30bb8088af
commit dbd4c6684c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mergetools/vimdiff
View File

@ -15,6 +15,17 @@ merge_cmd () {
"$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"
@ -52,7 +63,7 @@ exit_code_trustable () {
list_tool_variants () {
for prefix in '' g n; do
for suffix in '' 2 3; do
for suffix in '' 1 2 3; do
echo "${prefix}vimdiff${suffix}"
done
done