tests/test-issue619.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 06 Nov 2009 22:46:46 +0100
changeset 9731 0e080d519d1b
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
hgweb: treat rev as raw-rev if user agent is hg

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