Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2006:ff8b39daa930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show reason why an ignore file can't be read and state that it is skipped.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 25 Mar 2006 10:31:06 +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