From efb7c3863ff07975490988b64943a129b446e57e Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Sun, 22 Aug 2004 19:40:50 +0000
Subject: [PATCH] (svn r114) updated svnup.sh to display merged files
 (blathijs)

---
 svnup.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/svnup.sh b/svnup.sh
index 15a6071b4c..bca19ec06d 100644
--- a/svnup.sh
+++ b/svnup.sh
@@ -8,10 +8,15 @@
 Base=`svn info | grep "Revision" | xargs -n 1 | tail -n 1`
 
 # updates the source
-svn update
+svn update > svn.log
+cat svn.log
 
 # if the revision number changed
 if [ "$Base" -ne "`svn info | grep "Revision" | xargs -n 1 | tail -n 1`" ]; then
 # displays the log changes
 svn log -r HEAD:$(($Base + 1))
 fi
+
+# displays merged files
+cat svn.log|grep "^G"
+cat svn.log|grep "^C"
\ No newline at end of file