Mercurial > hg

view tests/test-conflict.out @ 1941:7518823709a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog.py: factorization and fixes for rev < 0 (nullid)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 13 Mar 2006 03:54:23 +0100
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