Changed verbosity back from -vvvv to -vv.
authorWayne Davison <wayned@samba.org>
Fri, 25 May 2007 14:32:08 +0000 (14:32 +0000)
committerWayne Davison <wayned@samba.org>
Fri, 25 May 2007 14:32:08 +0000 (14:32 +0000)
commit565a340b0a275faeff7b434ccf8bab98ff0d073d
tree18748503762c6434f3e09b9c7b20e41afa72d7b7
parentf45b64d8dd6010b9662cc103e732da03aa83a754
Changed verbosity back from -vvvv to -vv.
testsuite/merge.test