Mercurial > hg

view tests/test-update-renames.out @ 11627:04f76a954842

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
protocol: move the streamclone implementation into wireproto
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Tue, 20 Jul 2010 20:52:23 +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