[MERGE] Make merge --force work again.

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> Trying again
> 

BB:approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkm6XdoACgkQJdeBCYSNAAOQNwCfe/V7E35H2RRh0hvSN2ENp8mn
/ZUAoJAc4RMhlx7R8LQ/ByvnpxOo921d
=C032
-----END PGP SIGNATURE-----