Mercurial > hg
view tests/test-update-renames.out @ 11894:a15936ac7ec5
tests: unify test-mq
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun, 15 Aug 2010 21:41:45 +0900 |
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