Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1575:0a1cca912fda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style Namespace polution prevention (manifest vs. tagmanifest - shouldn't be a problem yet) File annotate updated File revision now has commit info
author Josef "Jeff" Sipek <jeffpc@optonline.net>
date Mon, 05 Dec 2005 07:07:40 -0500
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