Mercurial > hg

view tests/test-conflict.out @ 1923:7d83a351a936

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix testsuite for freebsd and one timingissue
author Peter van Dijk <peter@dataloss.nl>
date Tue, 21 Feb 2006 22:23:51 +0100
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