Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2059:a4c271765415

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: Use appropriate (that is: none) diff options on HP-UX.
author Sascha Wilde <wilde@sha-bang.de>
date Wed, 12 Apr 2006 17:53:04 +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