Mercurial > hg-stable

view tests/test-conflict.out @ 1086:50a8acefb53d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up help test
author mpm@selenic.com
date Sat, 27 Aug 2005 01:50:18 -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