Mercurial on Win

[Colin McMillen]

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

> +1 to a better merge script written in python.

How about making the svn-like merge script (provided recently on this
list) the default? That doesn't depend on any external tools of any
sort, since it just creates some copies of the conflicted files. Then
you can merge manually using whatever editor or diff program you like.
People who want to use kdiff3 or a Windows-native equivalent (if such a
thing exists) can still do so by installing it themselves and setting
their preferences accordingly.

- - Colin

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

iD8DBQFEbKkpXZxSS+Knk6ARAmSUAJsGTNJLjvp6U5AaQY7mPdo1AdPppACeLswY
hrQIP84k2roIV1dSJC8RWTY=
=vZqf
-----END PGP SIGNATURE-----