Mercurial > hg

view tests/test-update-renames.out @ 11065:76d6c19aa8ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record
author Christian Ebert <blacktrash@gmx.net>
date Sat, 01 May 2010 20:49:40 +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