tests/test-issue619.out
author Martin Geisler <mg@lazybytes.net>
Sun, 31 May 2009 01:13:45 +0200
changeset 8659 1a6d702e059d
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
test-hybridencode: break long string literals

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