Mercurial on Win

[Rafael Villar Burke]

Colin McMillen escribió:
> -----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.
>   
I think that's a really sensible default!. Minimal hassle and 
functionality. Big +1 for it.

Rafael Villar Burke