Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1038:5f191561a061

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with MPM.
author bos@eng-25.internal.keyresearch.com
date Wed, 24 Aug 2005 14:46:02 -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