Mercurial > hg

view tests/test-conflict.out @ 1927:397b62d5dd13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add http_proxy= lines to test-bad-pull and test-pull
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 16:11:17 +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