[MERGE][1.13] Make merge --force work again.

[James Westby]

On Fri, 2009-03-13 at 17:47 +1100, Robert Collins wrote:
> Turns out that merge didn't have tests for '--force'. So it broke with
> the recent 'check earlier' change.

BB:approve

Thanks,

James