projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add the merge test Linus called "test script from hell".
[git.git]
/
git-apply-patch-script
diff --git
a/git-apply-patch-script
b/git-apply-patch-script
index
13ec1c4
..
0849a3e
100755
(executable)
--- a/
git-apply-patch-script
+++ b/
git-apply-patch-script
@@
-8,7
+8,7
@@
#
case "$#" in
#
case "$#" in
-
2
)
+
1
)
echo >&2 "cannot handle unmerged diff on path $1."
exit 1 ;;
esac
echo >&2 "cannot handle unmerged diff on path $1."
exit 1 ;;
esac