[MERGE] Fix test_plan_file_merge

[Robert Collins]

This trivial patch fixes a failing test in the versionedfiles branch.
Supplied as an incremental tweak for review sanity.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: VersionedFiles.add_api-3377.patch
Type: text/x-patch
Size: 81600 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080612/a0f9992a/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080612/a0f9992a/attachment-0001.pgp