Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1363:8549335d19fc

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