Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 2011:b4df4687a78a
don't overquote description on gitweb summary page (issue 184)
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Tue, 28 Mar 2006 18:54:00 +0200 |
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