tests/test-issue619.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 16 Jul 2010 19:02:30 +0200
changeset 11619 48667abddd60
parent 11417 6f1d1ed3e19a
permissions -rw-r--r--
protocol: use return shortcut instead of respond function

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