Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1893:6569651a4f1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 20:13:58 +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