Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1623:eef8ff46567a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added test for the currently broken addremove with the expected output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 17 Jan 2006 15:03:47 +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