Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1921:acce3f7e1779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't expand empty [paths] so later interpolation can do the right thing. Example: [paths] default = default-push = %(default)s
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 20:34:09 +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