Mercurial > hg

view tests/test-conflict.out @ 1566:8befbb4e30b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle hg under /
author Arun Sharma <arun@sharma-home.net>
date Thu, 01 Dec 2005 10:48:42 -0600
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