kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'fc/mergetools-vimdiff3' 

* fc/mergetools-vimdiff3:
  mergetools: add vimdiff3 mode
maint
Junio C Hamano 2014-06-03 12:06:43 -07:00
parent b8ef69fe2e 7c147b77d3
commit 3a9dae783b
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mergetools/gvimdiff3 Normal file
View File

@ -0,0 +1 @@
. "$MERGE_TOOLS_DIR/vimdiff"

14
mergetools/vimdiff
View File

@ -20,16 +20,26 @@ merge_cmd () {
"$merge_tool_path" -f -d -c 'wincmd l' \ "$merge_tool_path" -f -d -c 'wincmd l' \
"$LOCAL" "$MERGED" "$REMOTE" "$LOCAL" "$MERGED" "$REMOTE"
;; ;;
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
;;
esac esac
check_unchanged check_unchanged
} }


translate_merge_tool_path() { translate_merge_tool_path() {
case "$1" in case "$1" in
gvimdiff|gvimdiff2) gvimdiff|gvimdiff2|gvimdiff3)
echo gvim echo gvim
;; ;;
vimdiff|vimdiff2) vimdiff|vimdiff2|vimdiff3)
echo vim echo vim
;; ;;
esac esac

1
mergetools/vimdiff3 Normal file
View File

@ -0,0 +1 @@
. "$MERGE_TOOLS_DIR/vimdiff"