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>
This commit is contained in:

committed by
Junio C Hamano

parent
abaf175cdf
commit
b2a6b7122e
@ -1,14 +1,6 @@
|
|||||||
diff_cmd () {
|
diff_cmd () {
|
||||||
case "$1" in
|
|
||||||
gvimdiff|vimdiff)
|
|
||||||
"$merge_tool_path" -R -f -d \
|
"$merge_tool_path" -R -f -d \
|
||||||
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
|
-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_cmd () {
|
merge_cmd () {
|
||||||
|
Reference in New Issue
Block a user