view tests/test-issue619.out @ 6461:eb69e7989145

tests: easier error diagnostics for test-serve
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 03 Apr 2008 12:46:37 +0200
parents cdc458b12f0f
children 5b48d819d5f9
line wrap: on
line source

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