[MERGE] Make merge --force work again.

[Robert Collins]

Trying again
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-4143.patch
Type: text/x-patch
Size: 5401 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090313/fc71ae06/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090313/fc71ae06/attachment.pgp