Mercurial > hg
view tests/test-update-renames.out @ 11400:e5b7841e0008
i18n-zh_CN: split messages into paragraphs
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 19 Jun 2010 17:19:15 +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