tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Thu, 13 May 2010 17:24:21 -0500
changeset 11173 5b48d819d5f9
parent 6375 cdc458b12f0f
child 11181 6e65b451b62e
permissions -rw-r--r--
commit: note new branch heads rather than topological heads Move to using contexts while we're at it.

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