Mercurial > hg
view tests/test-update-renames.out @ 12611:1f6bd49383b3 stable
Added signature for changeset 93d8bff78c96
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 01 Oct 2010 10:18:57 -0500 |
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