changeset 21404 | ca275f7ec576 |
parent 16899 | 8149ff405c78 |
child 23167 | a3c2d9211294 |
--- a/tests/test-convert-hg-source.t Thu Aug 02 13:51:34 2012 +0200 +++ b/tests/test-convert-hg-source.t Wed May 14 12:49:55 2014 -0700 @@ -24,6 +24,7 @@ $ hg ci -m 'merge local copy' -d '3 0' $ hg up -C 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + (leaving bookmark premerge1) $ hg bookmark premerge2 $ hg merge 2 merging foo and baz to baz