Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1910:e2fe1953f417

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changeset_templater: only compute manifest when --debug.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 27 Feb 2006 21:32:15 -0800
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