Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1890:d4545f1b8bfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix contrib/mercurial.spec for hgext
author Xiaofeng Ling <xiaofeng.ling@intel.com>
date Sun, 12 Mar 2006 15:07:40 +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