Mercurial > hg

view tests/test-update-renames.out @ 12213:218bd2a056f5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-it: perform msgmerge on the tip of the stable branch
author Paolo Giarrusso <p.giarrusso@gmail.com>
date Sat, 21 Aug 2010 00:33:13 +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