Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1964:778281d46bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix template bug that made hgweb break. problem found by Shun-ichi Goto <shunichi.goto@gmail.com>. this fix tested with command template and hgweb templates.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 15 Mar 2006 11:28:00 -0800
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