tests/test-issue619.out
author Brendan Cully <brendan@kublai.com>
Wed, 01 Aug 2007 14:32:05 -0700
changeset 5048 8db8e1100f3f
parent 4815 8808ea7da86b
permissions -rw-r--r--
Update asciidoc instructions to suggest html4 for newer versions

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