Mercurial > hg

view tests/test-conflict.out @ 1466:b6d9ea0bc107

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added a lot of comments to changegroupsubset.
author Eric Hopper <hopper@omnifarious.org>
date Tue, 11 Oct 2005 18:56:47 -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