Mercurial > hg

view tests/test-update-renames.out @ 11707:13d79a7bf5b7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runrst: try to be more helpful if docutils is not installed
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Fri, 30 Jul 2010 14:41:47 +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