Skip to content

Commit

Permalink
mergetools/vim: remove redundant diff command
Browse files Browse the repository at this point in the history
vimdiff and vimdiff2 differ only by their merge command so remove the
logic in the diff command since it's not actually needed.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
David Aguilar authored and Junio C Hamano committed Jan 28, 2013
1 parent abaf175 commit b2a6b71
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions mergetools/vim
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
diff_cmd () {
case "$1" in
gvimdiff|vimdiff)
"$merge_tool_path" -R -f -d \
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
;;
gvimdiff2|vimdiff2)
"$merge_tool_path" -R -f -d \
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
;;
esac
"$merge_tool_path" -R -f -d \
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
}

merge_cmd () {
Expand Down

0 comments on commit b2a6b71

Please sign in to comment.