mergetools/vim: remove redundant diff command

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>

diff --git a/mergetools/vim b/mergetools/vim
index 619594ae4bb54bb36f72efb496a5bd6fe59a3618..39d032771b8525253d3828fd68b2c7f6d6df8478 100644 (file)
--- a/mergetools/vim
+++ b/mergetools/vim
@@ -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 () {