Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1777:a2316878f19d
[hgweb] Static content serving
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Sat, 18 Feb 2006 21:53:41 -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