diff tests/test-merge1 @ 2599:e4b5e48052c6

Added tests for local and remote init. This tests the changes done in edb66cb05ded and b898afee9d0d.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 12 Jul 2006 09:01:10 +0200
parents e506c14382fd
children 49966b5ab16f
line wrap: on
line diff