Mercurial > hg
view tests/test-update-renames.out @ 11716:db426935fa94 stable
progress: use gerund (updating) for merge progress
author | timeless <timeless@gmail.com> |
---|---|
date | Fri, 30 Jul 2010 10:32:24 +0300 |
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