Mercurial > hg
view tests/test-update-renames.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 | 4f11978ae45d |
children |
line wrap: on
line source
merging a and b to b warning: conflicts during merge. merging b failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges