Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1613:17e39fd24cb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added archives links to gitweb template
author Guy Brand <gb@isis.u-strasbg.fr>
date Tue, 10 Jan 2006 13:12:13 +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