Mercurial > hg

view tests/test-update-renames.out @ 11801:dedf7c811436

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-committer
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 12 Aug 2010 22:19:59 +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