Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1216:1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 08 Sep 2005 09:11:17 +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