Mercurial > hg

view tests/test-update-renames.out @ 11461:2b83c26b29f3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-acl: don't use $PWD solaris ....
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 28 Jun 2010 23:23:55 +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