We had a chat in #mercurial yesterday regarding what needs to be improved in hgmerge.py to be considered for inclusion in mercurial proper. Based on that input, I will try to write an improved revision sometime this week (improved as in more compact, and with satisfactory configurability).
<br><br>Arve<br><br><div class="gmail_quote">On Dec 11, 2007 8:58 AM, dhruva <<a href="mailto:dhruvakm@gmail.com">dhruvakm@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Hi,<br><div class="Ih2E3d"><br>On Dec 11, 2007 1:00 PM, Patrick Mézard <<a href="mailto:pmezard@gmail.com">pmezard@gmail.com</a>> wrote:<br>> dhruva a écrit :<br>> > IMHO, having a dependency on cygwin for something that can easily be
<br>> > done in python is not a very good idea.<br>><br>> I still don't understand where this dependency comes from.<br><br></div>The default hgmerge script is a shell script for which you need a bash<br>shell (or equivalent) to run.
<br><br>-dky<br><font color="#888888"><br>--<br></font><div class="Ih2E3d">Contents reflect my personal views only!<br><br>_______________________________________________<br></div><div><div></div><div class="Wj3C7c">Mercurial-devel mailing list
<br><a href="mailto:Mercurial-devel@selenic.com">Mercurial-devel@selenic.com</a><br><a href="http://selenic.com/mailman/listinfo/mercurial-devel" target="_blank">http://selenic.com/mailman/listinfo/mercurial-devel</a><br>
</div></div></blockquote></div><br>