David AguilarLike 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> --- git-mergetool.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Show changes to git-mergetool.sh +1 −0
diff --git a/git-mergetool.sh b/git-mergetool.sh index 94187c3..d4078a6 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -296,6 +296,7 @@ do esac ;; --) + shift break ;; -*)
-- 1.6.1.rc3.38.gec9f0
