Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2125:3610d9468b1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use string literal concatenation for optlist and import -p option
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 25 Apr 2006 09:00:09 +0200
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a