Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1518:ac4ca6bf2383

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved error message for ambiguous command shortcuts.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 07 Nov 2005 19:00:51 +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