view tests/test-merge4.out @ 7330:781af9bb9684

Fix test output for updated gitdiffs help and web template cleanups
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Nov 2008 13:08:34 +0100
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)