changeset 13158 | 9e7e24052745 |
parent 12316 | 4134686b83e1 |
child 13272 | 5ccdca7df211 |
--- a/tests/test-newbranch.t Wed Dec 08 22:14:18 2010 -0600 +++ b/tests/test-newbranch.t Tue Dec 07 03:29:21 2010 +0100 @@ -208,12 +208,11 @@ $ hg branch foo $ hg commit -m'Merge ff into foo' + created new head $ hg parents - changeset: 6:917eb54e1b4b + changeset: 6:6af8030670c9 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