Andrew's git - gitweb.git/blob

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