Mercurial > hg

view tests/test-conflict.out @ 1271:9ab14ca22e37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ignore regression. An empty or non-existent hgignore file must return False (don't ignore) for everything.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 17 Sep 2005 00:37:14 -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