diff options
| author | David Aguilar <davvid@gmail.com> | 2013-01-25 01:43:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-27 18:32:43 -0800 |
| commit | b2a6b7122e66d4882ef5ac31e3a03969b5b6a199 (patch) | |
| tree | 4cda89469066ebe7f53324dba755b74d67c0fa1f /mergetools | |
| parent | abaf175cdf85ab0eb8bedd7d84ea8b42b6b3dd01 (diff) | |
| download | git-b2a6b7122e66d4882ef5ac31e3a03969b5b6a199.tar.gz git-b2a6b7122e66d4882ef5ac31e3a03969b5b6a199.tar.xz | |
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>
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/vim | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mergetools/vim b/mergetools/vim index 619594ae4..39d032771 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 () { |