Mercurial > hg

view tests/test-conflict.out @ 1438:c22da894e4cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh completions: new -M, -m arguments for log, etc.
author Steve Borho <steve@borho.org>
date Mon, 24 Oct 2005 16:54:07 -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