changeset 15623 | fc8c7a5ccc4a |
parent 15619 | 6c8573dd1b6b |
parent 15615 | 41885892796e |
child 22389 | 94f77624dbb5 |
--- a/tests/test-merge-default.t Thu Dec 08 16:39:00 2011 +0100 +++ b/tests/test-merge-default.t Thu Dec 08 16:01:44 2011 -0600 @@ -85,6 +85,7 @@ $ echo f >> a $ hg branch foobranch marked working directory as branch foobranch + (branches are permanent and global, did you want a bookmark?) $ hg commit -mf Should fail because merge with other branch: