view tests/test-merge2.out @ 1134:2cd33ea2f66b

Adjusted test-hup for generated .hg/hgrc
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 28 Aug 2005 18:30:40 +0200
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line source

adding b
adding b