Mercurial > hg

view tests/test-update-renames.out @ 11671:ca6ede0988d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove variable output affected by length of TMPDIR. If the temporary directory is longer than /tmp then it's possible that the Subject line will get wrapped by the headencode function.
author Lee Cantey <lcantey@gmail.com>
date Sun, 25 Jul 2010 08:22:03 -0700
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