Mercurial > hg > gitweb

view tests/test-conflict.out @ 2105:21cf3fe64e27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with cmason
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Apr 2006 12:12:03 -0500
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