Mercurial > hg
view tests/test-update-renames.out @ 11632:f418d2570920
log: document the different phases in walkchangerevs
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 20 Jul 2010 14:32:33 +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