view tests/test-merge2.out @ 6188:3b0c2b71e0d7

debugancestor: use *args instead of *opts, to not confuse with option dicts.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Feb 2008 01:14:37 +0100
parents b2ae81a7df29
children 4b0c9c674707
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