view tests/test-merge4.out @ 8870:c3e4d3c1d48b

serve: obey the --encoding option
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sun, 21 Jun 2009 16:27:07 +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)