[Cvs-cvs] Changes to ccvs/src/server.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.452.2.8 ccvs/src/server.c:1.452.2.9
--- ccvs/src/server.c:1.452.2.8 Thu Dec  1 01:49:00 2005
+++ ccvs/src/server.c   Thu Dec  1 20:23:55 2005
@@ -5268,7 +5268,10 @@
             * it into a temp file.  This will complete the process and print
             * the "U file" line.
             */
-           buf_output0 (protocol, "Base-entry ");
+           if (updated == SERVER_MERGED)
+               buf_output0 (protocol, "Base-merged ");
+           else
+               buf_output0 (protocol, "Base-entry ");
            output_dir (finfo->update_dir, finfo->repository);
            buf_output0 (protocol, finfo->file);
            buf_output (protocol, "\n", 1);