Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1413:1c64c628d15f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not use 'glob' expansion by default on OS != 'nt'
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 19 Oct 2005 00:02:41 -0700
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