[MERGE] help criss-cross should suggest using remerge

[Aaron Bentley]

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

Martin Pool wrote:
> It seems to me people who've got a criss-cross warning from merge will
> commonly want to use remerge.  If that's correct we could suggest it...

And I pretty much never use remerge.  I use revert; merge

Finally, remerge is broken with looms, because looms invert the parents
in the merge.  So this could lead to problems for users of the loom plugin.

> +If you have conflicts from a criss-cross merge in your working directory,
> +running "bzr remerge --weave FILE..." on particular affected files may 
> +help resolve the conflicts.

We shouldn't suggest --weave, we should suggest --lca.  It is faster and
gives better results.

>  This command will discard any changes already
> +made to the working file.

That is false.  Remerge reuses the foo.THIS file, not the last-committed
version of foo, so it preserves changes already made to the working file.

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

iD8DBQFH8vPM0F+nu1YWqI0RAhobAJsHDAHocadR4wmQYQPAkem+PV26jQCfVRFT
YytZuHUvr0/vd5dlLVJYRZY=
=wrei
-----END PGP SIGNATURE-----