view tests/test-issue619.out @ 11522:eaa7666ad53f stable

check-code: add test for callable
author Martin Geisler <mg@aragost.com>
date Fri, 09 Jul 2010 14:01:55 +0200
parents 6f1d1ed3e19a
children
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: merging with a working directory ancestor has no effect
done