Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2174:3044a3fdae76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If default sorting is name, offer name-descending with one click. Additionally no longer ignore case when sorting by name to match default sorting. This makes e.g. a repository "FOO" being listed before "bar".
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 01 May 2006 19:17:34 +0200
parents 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a