Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1140:04d52b446e5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't create repo objects in hgwebdir, ui object is enough.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 29 Aug 2005 07:19:02 +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