From 1432395f150af755edafa1119b2f5f1e0b4aebaf Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 19 Aug 2010 06:17:10 +0200
Subject: [PATCH] admin-merge: fix merge conflict detection

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

diff --git a/all b/all
index 92e54cb6..af1790c7 100755
--- a/all
+++ b/all
@@ -797,7 +797,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"
-- 
2.39.2