[Zope3-checkins] CVS: Zope3/src/zope/fssync - fsmerger.py:1.12

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/fssync
In directory cvs.zope.org:/tmp/cvs-serv30063

Modified Files:
	fsmerger.py 
Log Message:
Update the comment too.


=== Zope3/src/zope/fssync/fsmerger.py 1.11 => 1.12 ===
--- Zope3/src/zope/fssync/fsmerger.py:1.11	Tue Jun 10 15:12:07 2003
+++ Zope3/src/zope/fssync/fsmerger.py	Tue Jun 10 15:12:26 2003
@@ -92,7 +92,7 @@
     def merge_files(self, local, remote):
         """Merge remote file into local file."""
 
-        # Reset sticky conflict if file was edited
+        # Reset sticky conflict if file was edited or removed
         entry = self.metadata.getentry(local)
         conflict = entry.get("conflict")
         if conflict and (not os.path.exists(local) or