Mercurial > hg-stable
view tests/test-update-renames.out @ 10918:1d8a13bb42ae
add +x to test-update-renames, removed by the merge on 24ed7a541f23
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 15 Apr 2010 15:34:27 +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