diff tests/test-double-merge.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 368a4ec603cc
children 50b6af595e0c
line wrap: on
line diff