X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-mergetool.sh;h=d4078a6affd9b4c1fa52e6dba0fe6c151fa452dc;hb=43a7ddb55d82d5c6f0c4d2cbe408a1df71d58ef3;hp=94187c306ccb05d977f2bb35e81828130ab49a61;hpb=d96ca27e1089a190139591ac365873f26bffcf5c;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 94187c306..d4078a6af 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -296,6 +296,7 @@ do
 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)