Mercurial > hg

view tests/test-conflict.out @ 1400:cf9a1233738a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n first part: make '_' available for files who need it
author Benoit Boissinot <benoit.boissinot@ens-lyon.org
date Tue, 18 Oct 2005 18:37:48 -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