Mercurial > hg

view tests/test-update-renames.out @ 11090:70a0acfe51d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Brendan Cully <brendan@kublai.com>
date Mon, 03 May 2010 15:27:05 -0700
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