cvs-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] Changes to ccvs/src/ChangeLog [signed-commits2]

From: Derek Robert Price
Subject: [Cvs-cvs] Changes to ccvs/src/ChangeLog [signed-commits2]
Date: Mon, 05 Dec 2005 17:07:32 -0500 
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3306.2.38 ccvs/src/ChangeLog:1.3306.2.39
--- ccvs/src/ChangeLog:1.3306.2.38      Mon Dec  5 22:00:21 2005
+++ ccvs/src/ChangeLog  Mon Dec  5 22:07:32 2005
@@ -1,5 +1,7 @@
 2005-12-05  Derek Price  <address@hidden>
 
+       * client.c (update_entries): Create timestamp when LAST_MERGE_CONFLICT.
+
        * server.c (server_updated): Don't dereference NULL.  Don't send diffs
        when revisions are identical.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]