[Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1095.4.20 ccvs/src/sanity.sh:1.1095.4.21
--- ccvs/src/sanity.sh:1.1095.4.20      Thu Dec  1 03:37:49 2005
+++ ccvs/src/sanity.sh  Thu Dec  1 13:49:56 2005
@@ -16927,10 +16927,9 @@
 new revision: 1\.2; previous revision: 1\.1"
          cd ../..
          cd 2/first-dir
-         dotest watch4-13 "${testcvs} -q update" \
+         dotest watch4-13 "$testcvs -q update" \
 "Merging differences between 1\.1 and 1\.2 into file1
-rcsmerge: warning: conflicts during merge
-${SPROG} update: conflicts found in file1
+$CPROG update: conflicts during merge
 C file1"
          if (echo yes | ${testcvs} unedit file1) >>${LOGFILE}; then
            pass watch4-14