Mercurial > hg

view tests/test-conflict.out @ 2104:f1085d34d20d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add tests/test-committer This checks to see if the EMAIL environment variable is being used for commit.
author Andrew Thompson <andrewkt@aktzero.com>
date Thu, 20 Apr 2006 16:33:49 +0200
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