Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1849:360d0f8d9d6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show ambiguous aliases, if they are not simple abbreviations. Sort output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Mar 2006 08:41:13 +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