Mercurial > hg

view tests/test-conflict.out @ 1070:b55c6685c953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgwebdir index: change "author" to "contact"
author mpm@selenic.com
date Fri, 26 Aug 2005 13:59:14 -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