view tests/test-merge2.out @ 4941:8933b8ea871a

Use format string for lockname again (was changed by 3e25a6eb5c9a)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:39:42 +0200
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b