branch | stable |
changeset 13550 | 1792b8a9422b |
parent 13158 | 9e7e24052745 |
child 15615 | 41885892796e |
--- a/tests/test-issue619.t Sat Mar 05 16:34:59 2011 -0600 +++ b/tests/test-issue619.t Mon Mar 07 15:03:10 2011 -0600 @@ -19,12 +19,7 @@ $ hg merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) - $ hg branch - default - $ hg parent --template '{rev}:{node|short} {branches}: {desc}\n' - 1:06c2121185be b: b $ hg ci -Ammerge - created new head Bogus fast-forward should fail: