mergetools/vim: remove redundant diff command
authorDavid Aguilar <davvid@gmail.com>
Fri, 25 Jan 2013 09:43:52 +0000 (01:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 02:32:43 +0000 (18:32 -0800)
commitb2a6b7122e66d4882ef5ac31e3a03969b5b6a199
tree4cda89469066ebe7f53324dba755b74d67c0fa1f
parentabaf175cdf85ab0eb8bedd7d84ea8b42b6b3dd01
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>
mergetools/vim