Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2098:190c6a81e6ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove bogus raise from localrepo.lookup()
author Chris Mason <mason@suse.com>
date Wed, 19 Apr 2006 15:35:10 -0400
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a