diff tests/test-merge1.out @ 3398:0f308690bda8

Fixed contrib/hgdiff script to pass diffopts in the new format.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 15 Oct 2006 20:56:38 +0200
parents f472cf9a71af
children d2b55e3c4e25
line wrap: on
line diff