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

[Derek Robert Price]

Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.16 ccvs/src/client.c:1.433.4.17
--- ccvs/src/client.c:1.433.4.16        Fri Dec  2 23:50:48 2005
+++ ccvs/src/client.c   Mon Dec  5 22:07:32 2005
@@ -2008,7 +2008,7 @@
        (void) time (&last_register_time);
 
        local_timestamp = data->timestamp;
-       if (!local_timestamp || ts[0] == '+')
+       if (!local_timestamp || ts[0] == '+' || last_merge_conflict)
            file_timestamp = time_stamp (filename);
        else
            file_timestamp = NULL;