Mercurial > hg

view tests/test-update-renames.out @ 10879:29030b7f664a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 09 Apr 2010 15:16:31 +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