tests/test-newbranch.t
branchstable
changeset 13550 1792b8a9422b
parent 13455 053c042118bc
child 14162 301725c3df9a
--- a/tests/test-newbranch.t	Sat Mar 05 16:34:59 2011 -0600
+++ b/tests/test-newbranch.t	Mon Mar 07 15:03:10 2011 -0600
@@ -209,11 +209,12 @@
   $ hg branch
   foo
   $ hg commit -m'Merge ff into foo'
-  created new head
   $ hg parents
-  changeset:   6:6af8030670c9
+  changeset:   6:917eb54e1b4b
   branch:      foo
   tag:         tip
+  parent:      4:98d14f698afe
+  parent:      5:6683a60370cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Merge ff into foo