[Cvs-cvs] Changes to ccvs/src/vers_ts.c [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/vers_ts.c
diff -u ccvs/src/vers_ts.c:1.43.4.7 ccvs/src/vers_ts.c:1.43.4.8
--- ccvs/src/vers_ts.c:1.43.4.7 Wed Jun 22 18:56:05 2005
+++ ccvs/src/vers_ts.c  Thu Sep 22 18:13:29 2005
@@ -302,6 +302,13 @@
        else if (entdata->timestamp
                 && entdata->timestamp[0] == '=')
            mark_unchanged (vers_ts);
+       else if (entdata->conflict
+                && entdata->conflict[0] == '=')
+       {
+           /* These just need matching content.  Might as well minimize it.  */
+           vers_ts->ts_user = xstrdup ("");
+           vers_ts->ts_conflict = xstrdup ("");
+       }
        else if (entdata->timestamp
                 && (entdata->timestamp[0] == 'M'
                     || entdata->timestamp[0] == 'D')