[MERGE] help criss-cross should suggest using remerge

[Aaron Bentley]

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

Stefan Monnier wrote:
>> 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.
> 
> What about changes made to the working file (i.e. the file that
> contains the merge with conflict markers)?

Changes made before merging will be present in the .THIS file.  Changes
made after merging will be discarded.

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

iD8DBQFH89Ko0F+nu1YWqI0RAnTLAJ9QgmLF8fDXesnlAxBOVZSMpSJHEACcDHAV
24jdKMFIQULsNLmdvW2MeZY=
=4OdY
-----END PGP SIGNATURE-----