From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Sep 2010 08:23:10 +0000 (+0200)
Subject: fix admin-merge test compile
X-Git-Tag: xonotic-v0.1.0preview~192
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=13b1970d4835e3d431b868575b988109ac78ca48

fix admin-merge test compile
---

diff --git a/all b/all
index 39b3b405..365ef686 100755
--- a/all
+++ b/all
@@ -833,7 +833,7 @@ case "$cmd" in
 							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
 							reportdo4 cat "$t"
 							reportecho4 "--> merge failed"
-						elif ! "$SELF" compile -n 2>&1 | tee "$t"; then
+						elif ! "$SELF" compile 2>&1 | tee "$t"; then
 							git reset --hard "$org"
 							GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
 							reportdo4 cat "$t"