Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1852:fdf9cbf56ec7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix mq's usage of opener, which don't allow absolute paths now.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Mar 2006 22:41:24 +0100
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