Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2009:182f500805db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix broken hgignore tests due to full path showing up in output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 26 Mar 2006 22:54:05 +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