Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1795:36e19e3da12d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix 'hg serve' not using CSS. hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
author Lee Cantey <lcantey@gmail.com>
date Thu, 23 Feb 2006 12:02:39 +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