Added tests for --merge.
[0publish.git] / tests / 
treee22e2f4cbfce4013a9720d47ce371b0a82173c4b
drwxr-xr-x   ..
-rw-r--r-- 467 local-req.xml
-rw-r--r-- 400 local.xml
-rwxr-xr-x 3295 testlocal.py
-rwxr-xr-x 1996 testvalidator.py