From: David Aguilar <davvid@gmail.com>
Date: Fri, 25 Jan 2013 09:43:52 +0000 (-0800)
Subject: mergetools/vim: remove redundant diff command
X-Git-Tag: v1.8.2-rc0~40^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b2a6b7122e66d4882ef5ac31e3a03969b5b6a199?ds=inline;hp=--cc

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>
---

b2a6b7122e66d4882ef5ac31e3a03969b5b6a199
diff --git a/mergetools/vim b/mergetools/vim
index 619594ae4b..39d032771b 100644
--- 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 () {