Mercurial > hg

view tests/test-update-renames.out @ 11082:b8d0b4721aff stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added signature for changeset 39f725929f0c
author Matt Mackall <mpm@selenic.com>
date Sat, 01 May 2010 16:02:51 -0500
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