changeset 21404 | ca275f7ec576 |
parent 16913 | f2719b387380 |
child 26420 | 2fc86d92c4a9 |
--- a/tests/test-issue1877.t Thu Aug 02 13:51:34 2012 +0200 +++ b/tests/test-issue1877.t Wed May 14 12:49:55 2014 -0700 @@ -34,6 +34,7 @@ $ hg up 1e6c11564562 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + (leaving bookmark main) $ hg merge main 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)