X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=Makefile;h=34b017bfa7824e47390686c87410031e805afd64;hp=c3eeac4b773762501d9e4781ee405aa316cf25a2;hb=cc015174898b9ebed02694588d1497e6f18ad5df;hpb=ccead56701655050a18b883e024ae7a74325373e

diff --git a/Makefile b/Makefile
index c3eeac4..34b017b 100755
--- a/Makefile
+++ b/Makefile
@@ -382,8 +382,13 @@ datafiles: all
 update: 
 	@if [ -d CVS ]; then \
 		echo "Updating from CVS..." ; \
-		cvs -q -z3 update -Pd; \
+		cvs -q -z3 update -Pd | tee update.out; \
 		rm -f .version; \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
+			echo ; echo "The following files have conflicts:" ; \
+			grep ^C update.out | cut -d' ' -f2- ; \
+		fi ; \
+		rm -f update.out; \
 	else \
 		echo "Not CVS";  \
 	fi