Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1462:12a8d772fa32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Optimizing manifest reads in changegroupsubset by using deltas.
author Eric Hopper <hopper@omnifarious.org>
date Mon, 10 Oct 2005 08:36:29 -0700
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