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>
David Aguilar committed
Jan 25, 2013 at 01:43 UTC
b2a6b7122e66d4882ef5ac31e3a03969b5b6a199
1 file changed
+2
-10
mergetools/vim
+2
-10
@@ -1,14 +1,6 @@
1
diff_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
2
+ "$merge_tool_path" -R -f -d \
3
+ -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
4
}
5
6
merge_cmd () {