Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2007:2ffa36dc3423

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
show committer's name on gitweb's summary page (issue 137)
author TK Soh <teekaysoh@yahoo.com>
date Sun, 26 Mar 2006 07:28:52 -0800
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