Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1918:7f0899f7828c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix template tests.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 12 Mar 2006 15:50:18 -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