Mercurial > hg

view tests/test-conflict.out @ 1472:3c909a747d7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make revert use standard matcher
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 27 Oct 2005 13:31:12 -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