Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1425:8fe4116b3253
hgweb: improve look-n-feel of changelog nagivation
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Mon, 24 Oct 2005 14:53:25 -0700 |
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