tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Fri, 14 May 2010 10:01:09 -0500
changeset 11175 39e7f14a8286
parent 11173 5b48d819d5f9
child 11181 6e65b451b62e
permissions -rw-r--r--
rollback: fix up tests

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
created new head
bogus fast-forward should fail
abort: can't merge with ancestor
done