Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 1445:56281e086f38
hgweb: add strip and rstrip filters to handle summary
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Tue, 25 Oct 2005 14:57:14 -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