Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
quiltimport: Skip non-existent patches
[gitweb.git]
/
git-mergetool.sh
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index 47a80553ad3283c49cae0fbffcf444b93c8e34b7..a0e44f71c4acd5d995bf823913ba63e119ed2e68 100755
(executable)
--- a/
git-mergetool.sh
+++ b/
git-mergetool.sh
@@
-268,7
+268,7
@@
merge_file () {
cleanup_temp_files
}
-while
case $# in 0) break ;; esac
+while
test $# != 0
do
case "$1" in
-t|--tool*)