From 13b1970d4835e3d431b868575b988109ac78ca48 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Sep 2010 10:23:10 +0200
Subject: [PATCH] fix admin-merge test compile

---
 all | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"
-- 
2.39.2