Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Fix code checking for D/F conflicts still being present
[gitweb.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index cf1f64b574b180332105d95295dfa35c8f6e10bb..6cdd5910db50c96df3d149fba172750cb10c09cb 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-577,13
+577,6
@@
then
resume=
fi
-if test "$this" -gt "$last"
-then
- say Nothing to do.
- rm -fr "$dotest"
- exit
-fi
-
while test "$this" -le "$last"
do
msgnum=`printf "%0${prec}d" $this`