Mercurial > hg

view tests/test-update-renames.out @ 12090:ee601a6264e0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mail: use standard section.entry format in error message
author Martin Geisler <mg@lazybytes.net>
date Mon, 30 Aug 2010 22:47:38 +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