Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1456:214f42f23a3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove copy/rename --parents option This is no longer needed now that we have more standard UNIX-like copy semantics.
author Matt Mackall <mpm@selenic.com>
date Wed, 26 Oct 2005 16:32:50 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a