Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1540:8ca9f5b17257

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor optimization: save some string trash
author twaldmann@thinkmo.de
date Mon, 14 Nov 2005 02:30:19 +0200
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