tests/test-branch-tag-confict.t
changeset 14162 301725c3df9a
parent 13750 7eb82f88e157
child 15615 41885892796e
--- a/tests/test-branch-tag-confict.t	Mon May 02 12:36:23 2011 +0200
+++ b/tests/test-branch-tag-confict.t	Mon May 02 19:20:29 2011 +0200
@@ -19,7 +19,7 @@
 This is what we have:
 
   $ hg log
-  changeset:   2:02b1af9b58c2
+  changeset:   2:10519b3f489a
   branch:      branchortag
   tag:         tip
   user:        test
@@ -53,7 +53,7 @@
   $ hg up 'branch(branchortag)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg parents
-  changeset:   2:02b1af9b58c2
+  changeset:   2:10519b3f489a
   branch:      branchortag
   tag:         tip
   user:        test