view tests/test-merge2.out @ 2895:41f8b041893b

Adjusted test to changed help output.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 15 Aug 2006 11:47:17 +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