Mercurial > hg

view tests/test-update-renames.out @ 11210:0c0088881562

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: add check for 'source'
author Yuya Nishihara <yuya@tcha.org>
date Fri, 21 May 2010 22:53:57 +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