X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=3e120e5b86d489f26a2d9a6c31836ab091141c5d;hp=a24b92af4c19e22c96559d568f4081cf0c10bd9f;hb=c3b65641f6ba82a8e001ab57b5d9117f907e7669;hpb=a675524294f3da80f63b45b69afc2006b779a45f

diff --git a/all b/all
index a24b92af..3e120e5b 100755
--- a/all
+++ b/all
@@ -792,7 +792,7 @@ case "$cmd" in
 					elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
 						git checkout "$realbase"
 						org=`git rev-parse HEAD`
-						if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
+						if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1	' >/dev/null; }; then
 							git reset --hard "$org"
 							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
 							reportdo4 cat "$t"