Mercurial > hg

view tests/test-conflict.out @ 939:6b735e0ddd81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix stray debug statement
author mpm@selenic.com
date Wed, 17 Aug 2005 18:41:04 -0800
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