tests/test-issue619.out
author Matt Mackall <mpm@selenic.com>
Wed, 14 Jul 2010 15:25:15 -0500
changeset 11582 26c7d4fc31bf
parent 11417 6f1d1ed3e19a
permissions -rw-r--r--
protocol: use new wireproto infrastructure in ssh - add protocol helper - insert wireproto into dispatcher - drop duplicate functions from hgweb implementation

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: merging with a working directory ancestor has no effect
done