Andrew's git - gitweb.git/blob - mergetools/vimdiff

   1diff_cmd () {
   2        "$merge_tool_path" -R -f -d \
   3                -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
   4}
   5
   6merge_cmd () {
   7        touch "$BACKUP"
   8        case "$1" in
   9        gvimdiff|vimdiff)
  10                if $base_present
  11                then
  12                        "$merge_tool_path" -f -d -c 'wincmd J' \
  13                                "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
  14                else
  15                        "$merge_tool_path" -f -d -c 'wincmd l' \
  16                                "$LOCAL" "$MERGED" "$REMOTE"
  17                fi
  18                ;;
  19        gvimdiff2|vimdiff2)
  20                "$merge_tool_path" -f -d -c 'wincmd l' \
  21                        "$LOCAL" "$MERGED" "$REMOTE"
  22                ;;
  23        esac
  24        check_unchanged
  25}
  26
  27translate_merge_tool_path() {
  28        case "$1" in
  29        gvimdiff|gvimdiff2)
  30                echo gvim
  31                ;;
  32        vimdiff|vimdiff2)
  33                echo vim
  34                ;;
  35        esac
  36}