[Cvs-cvs] Changes to ccvs/src/ChangeLog [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.404 ccvs/src/ChangeLog:1.2336.2.405
--- ccvs/src/ChangeLog:1.2336.2.404     Fri Sep 23 16:42:58 2005
+++ ccvs/src/ChangeLog  Sat Sep 24 18:02:28 2005
@@ -1,3 +1,7 @@
+2005-09-24  Derek Price  <address@hidden>
+
+       * update.c (merge_file): Check for RCS_checkout errors.
+
 2005-09-23  Larry Jones  <address@hidden>
 
        * checkout.c (export_usage): Note that -r requires a tag.