Mercurial > hg
view tests/test-conflict.out @ 1574:32b091ce4026
[hgweb] More gitweb style related fixes
Fixed manifest link on tags page
Fixed changeset link on manifest page
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Mon, 05 Dec 2005 05:01:28 -0500 |
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