David Aguilar ce2c3ebbc5 git-mergetool: properly handle "git mergetool -- filename" ...

Like many git commands, git-mergetool allows "--" to signal
the end of option processing.  This adds a missing "shift"
statement so that this is correctly handled.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-12-19 19:10:58 -08:00

9.7 KiB

Executable File

Raw Blame History

View Raw