Mercurial > hg > gitweb

view tests/test-conflict.out @ 1972:ce127cb4ee6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented behaviour of write_bundle regarding file handles.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 18 Mar 2006 10:45:21 +0100
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