tests/test-parse-date.out
changeset 2967 eef469259745
parent 2524 c1974f65d781
child 3255 e96d2956eb4a
--- a/tests/test-parse-date.out	Sun Aug 20 22:51:56 2006 -0500
+++ b/tests/test-parse-date.out	Sun Aug 20 23:52:52 2006 -0500
@@ -1,6 +1,6 @@
 reverting a
 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8
-merging with changeset 2:99a1acecff55
+merging with changeset 2:e6c3abc120e7
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 abort: invalid date: 'should fail'