tests/test-issue619.out
author Christian Ebert <blacktrash@gmx.net>
Mon, 04 Feb 2008 18:27:36 +0100
changeset 6023 ee7df90d1daa
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
keyword: split line continuation in 2 steps (style)

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: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done