Mercurial > hg-stable

view tests/test-update-renames.out @ 11687:4f3883979e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: add warning on lines over 80 characters
author Matt Mackall <mpm@selenic.com>
date Sun, 25 Jul 2010 17:10:32 -0500
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