tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Sun, 24 May 2009 02:56:14 -0500
changeset 8576 ec4ed21db4b2
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
match: split up _normalizepats

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