Mercurial > hg

view tests/test-update-renames.out @ 11414:0fa4474bdc2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pager: respect HGPLAIN Pager shouldn't be enabled for scripting use.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 20 Jun 2010 01:20:12 +0900
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