view tests/test-merge4.out @ 6418:593a598a9377

convert: fix trailing space introduced in 5efd447a9b8d
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 31 Mar 2008 13:10:47 +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)