[Svnmerge] r26883: svnmerge fails tests

[Dustin J. Mitchell]

Revision 26883 broke some tests, because the added parameter wasn't
matched in the tests.

Attached patch fixes the tests, as well as a redundant space in svnmerge.py.

Dustin

-- 
Storage Software Engineer
http://www.zmanda.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-26883.patch
Type: application/octet-stream
Size: 2940 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20071024/8cf5020b/attachment.obj