Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix the building of gitman.info document
[gitweb.git]
/
git-mergetool.sh
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index 94187c306ccb05d977f2bb35e81828130ab49a61..d4078a6affd9b4c1fa52e6dba0fe6c151fa452dc 100755
(executable)
--- a/
git-mergetool.sh
+++ b/
git-mergetool.sh
@@
-296,6
+296,7
@@
do
esac
;;
--)
+ shift
break
;;
-*)