diff tests/test-merge1.out @ 1763:fa34a74efc40

Make option --branch vs. --branches more consistent. As you can abbreviate --branches to --branch, old scripts using the long name will still work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 21 Feb 2006 13:14:03 +0100
parents db10b7114de0
children 2da2d46862fb
line wrap: on
line diff