Mercurial > hg

view tests/test-update-renames.out @ 12228:3ccd5b999500 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: merge with stable
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Thu, 26 Aug 2010 22:27:20 -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