view tests/test-merge4.out @ 6721:521c6c6f3b9b

kill some trailing spaces
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 13:12:32 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)