Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1182:24d553b598e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 31 Aug 2005 21:07:36 +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