Improving Windows support

[Michael P. Soulier]

On 16/04/07 TK Soh said:

> Bottom line, we can't have a distributed VCS like Hg without the
> capability to merge. So IMO, Hg should provide it's own internal
> merging support. For now, perhaps one (written in python?) can be
> bundled with the Windows installer. Though some hacking might be
> required to make it work 'out of the box'.

I agree. The default should be CVS-like conflict behaviour, and it can respect
the HGMERGE environment variable or .ini setting if present. The current
behaviour is not a good thing. 

Mike
-- 
Michael P. Soulier <msoulier at digitaltorque.ca>
"Any intelligent fool can make things bigger and more complex... It
takes a touch of genius - and a lot of courage to move in the opposite
direction." --Albert Einstein
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20070416/0863cfbc/attachment.pgp