From a660cd805242c5a610684a72b2f426c37ecb6dc7 Mon Sep 17 00:00:00 2001
From: "bryner%uiuc.edu" <bryner%uiuc.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 22 Jun 2000 21:56:41 +0000
Subject: [PATCH] Fix bug 43494 - client.mk should stop if you had checkout
 conflicts.  r=alecf.

git-svn-id: svn://10.0.0.236/trunk@72949 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/client.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/client.mk b/mozilla/client.mk
index 321837fa925..8abd403993e 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -288,8 +288,8 @@ real_checkout:
         cvs_co $(CVSCO_LDAPCSDK) && \
 	cvs_co $(CVSCO_SEAMONKEY)
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
-#	@: Check the log for conflicts. ;\
-	conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
+#	@: Check the log for conflicts. ;
+	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
 	if test "$$conflicts" ; then \
 	  echo "$(MAKE): *** Conflicts during checkout." ;\
 	  echo "$$conflicts" ;\