[Zope3-checkins] CVS: Zope3/src/zope/fssync/tests - test_merger.py:1.6

[Guido van Rossum]

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

Modified Files:
	test_merger.py 
Log Message:
Change mention of 'merge' into 'diff3' in comment.


=== Zope3/src/zope/fssync/tests/test_merger.py 1.5 => 1.6 ===
--- Zope3/src/zope/fssync/tests/test_merger.py:1.5	Tue May 13 10:10:06 2003
+++ Zope3/src/zope/fssync/tests/test_merger.py	Tue May 13 10:13:20 2003
@@ -171,7 +171,7 @@
 
     def test_both_modified_resolved(self):
         if os.name != "posix":
-            # Alas, this test requires the external command 'merge'
+            # Alas, this test requires the external command 'diff3'
             # which isn't usually found on Windows
             return
         self.runtest("l\na\n", "a\n", "a\nr\n", {}, {}, "Merge", "Modified")