Branch b1_4

Put only the filenames into the cvs-merge-conflicts file, so that
vi `cat cvs-merge-conflicts` works.

diff --git a/build/land1.sh b/build/land1.sh
index 6765c37..d3d643e 100755 (executable)
--- a/build/land1.sh
+++ b/build/land1.sh
@@ -106,7 +106,8 @@ $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date $dir
 echo "done"
 
 echo -n "Recording conflicts in $CONFLICTS ..."
-if $CVS update | grep '^C' > $CONFLICTS; then
+$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS
+if [ -s $CONFLICTS ] ; then
     echo "Conflicts found, fix before committing."
     cat $CONFLICTS
 else