Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1132:92525920ad29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Completed renaming author to contact in hgwebdir: Prefer [web] contact = foo instead of author, but still accept the old name. Adjusted template to show obfuscated contact. Drop bogus <i>email</i> entry.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 28 Aug 2005 18:13:28 +0200
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