OSSP CVS Repository

ossp - Difference in ossp-pkg/svs/ChangeLog versions 1.6 and 1.7
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/svs/ChangeLog 1.6 -> 1.7

--- ChangeLog    2005/02/06 12:17:47     1.6
+++ ChangeLog    2005/08/18 07:46:14     1.7
@@ -8,6 +8,13 @@
 
   ChangeLog
 
+  Changes between 1.0.2 and 1.0.3 (06-Feb-2005 to 18-Aug-2005):
+
+    *) Do not show a file as both modified and conflicting if both
+       *.orig and *.rej exists. Instead list it just as conflicting
+       as "cvs" does.
+       [Ralf S. Engelschall]
+
   Changes between 1.0.1 and 1.0.2 (13-Jan-2005 to 06-Feb-2005):
 
     *) Replace unportable "if ! <cmd>" construct.

CVSTrac 2.0.1