Mercurial > hg

view tests/test-update-renames.out @ 11680:7fefef3ce791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: warn on superfluous / in paths shlex is really a bad parser for this line-based format ...
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 20 Jul 2010 15:49:28 +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