Mercurial > hg

view tests/test-update-renames.out @ 10881:a685011ed38e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: add desc parameter to transaction All callers to localrepo.transaction() must supply a transaction description. The description and the existing repository tip are then stored (transactionally) into .hg/undo.desc; where rollback can later find it.
author Steve Borho <steve@borho.org>
date Fri, 09 Apr 2010 17:23:35 -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