Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1743:813f9f5fe837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 18 Feb 2006 06:50:22 +0100
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