Mercurial on Win
Manpreet Singh
junkblocker at yahoo.com
Thu May 18 12:44:08 CDT 2006
--- Colin McMillen <mcmillen at cs.cmu.edu> wrote:
> -----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
>
+1 for that. I am hoping for Vadim's code to become
the default too with a flag to always popup the editor
on merge results (or not) even if the automatic merge
succeeds.
-Manpreet
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
More information about the Mercurial
mailing list