Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1277:0bf11906df28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a favicon.ico, small version of the main HG image.
author Ollivier Robert <roberto@keltia.freenix.fr>
date Mon, 19 Sep 2005 22:15:36 +0200
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