Mercurial > hg

view tests/test-conflict.out @ 2053:0f17f54333b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include tests/md5sum.py in manifest.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 08 Apr 2006 10:14: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