Mercurial > hg

view tests/test-update-renames.out @ 11446:0f623839a5cc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: remove debugging leftover
author Julian Cowley <julian@lava.net>
date Fri, 25 Jun 2010 01:27:25 -1000
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