[MERGE] help criss-cross should suggest using remerge

[Aaron Bentley]

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

Martin Pool wrote:
> On undefined, Aaron Bentley <aaron at aaronbentley.com> wrote:
> Anyhow here is take #2.

bb:approve

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH9Czg0F+nu1YWqI0RAp+3AJsGVLeOydgLY5KoyFlkAsl2gvx0rQCfRfpm
5OVsnykN3/fU0b+CxJG85WM=
=5eRU
-----END PGP SIGNATURE-----