Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 1306:c9fa33088bd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add release notes to built Windows package.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 21 Sep 2005 15:50:43 -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