Remerge implemented

[Aaron Bentley]

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

I've implemented the remerge command.  So if you get conflicts, you can
try out other merge strategies.

I've discovered that for at least one case, merge3+reprocess wins over
weave merge or diff3.  Perhaps we'll wind up implementing reprocess so
that it works on any merge with herringbone conflict markers.

One other thing to do would be a --unix-newlines merge filter.

Or... --merge-type meld >:D

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

iD8DBQFDYsok0F+nu1YWqI0RAtCJAJ41nPqmo5Jvn1hsoThhqV+A6VV8/gCfactQ
hlZH7v1/QoeejpN4PlkQvWs=
=3MXx
-----END PGP SIGNATURE-----