Mercurial > hg

view tests/test-conflict.out @ 1166:bd66294b7a9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added test case for zip/gz/bz2 archive downloads.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 30 Aug 2005 19:17:05 +0200
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