[Cvs-cvs] Changes to ccvs/src/client.c

[Derek Robert Price]

Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.429 ccvs/src/client.c:1.430
--- ccvs/src/client.c:1.429     Tue Jul 12 13:46:38 2005
+++ ccvs/src/client.c   Fri Sep 23 03:19:22 2005
@@ -4558,7 +4558,9 @@
           just happen.  */
     }
     else if (!vers->ts_rcs || args->force
-            || strcmp (vers->ts_user, vers->ts_rcs))
+            || strcmp (vers->ts_conflict
+                       ? vers->ts_conflict : vers->ts_rcs, vers->ts_user)
+            || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff")))
     {
        if (args->no_contents
            && supported_request ("Is-modified"))