From: David Aguilar Date: Fri, 25 Jan 2013 09:43:52 GMT Subject: [PATCH 5/7] mergetools/vim: Remove redundant diff command Message-ID: <1359107034-14606-6-git-send-email-davvid@gmail.com> In-Reply-To: <1359107034-14606-1-git-send-email-davvid@gmail.com> 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 --- mergetools/vim | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mergetools/vim b/mergetools/vim index 619594a..39d0327 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 () { -- 1.8.1.1.367.g22b1720.dirty