tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Sat, 07 Nov 2009 14:12:08 -0600
changeset 9753 ffda19f351fa
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
Fix up import test

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)
bogus fast-forward should fail
abort: can't merge with ancestor
done