Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 1309:332f225b835c
Make debugwalk strip trailing spaces and remove these from test-walk.out
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 21 Sep 2005 08:07:38 +0200 |
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