<div dir="ltr">On 22 August 2013 05:34, Tim Peters <span dir="ltr"><<a href="mailto:tim.peters@gmail.com" target="_blank">tim.peters@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Anyone know a reason not to do:<br>
<br>
hg -y merge --tool=internal:fail 3.2<br>
<br>
instead?  I saw that idea on some Hg wiki.</blockquote><div><br></div><div>That would be from <a href="http://mercurial.selenic.com/wiki/TipsAndTricks#Keep_.22My.22_or_.22Their.22_files_when_doing_a_merge">http://mercurial.selenic.com/wiki/TipsAndTricks#Keep_.22My.22_or_.22Their.22_files_when_doing_a_merge</a>. I think it's a perfectly reasonable approach.</div>
<div><br></div><div>I expanded on it a little to make it more general (to choose which parent to discard) in <a href="http://stackoverflow.com/questions/14984793/mercurial-close-default-branch-and-replace-with-a-named-branch-as-new-default/14991454#14991454">http://stackoverflow.com/questions/14984793/mercurial-close-default-branch-and-replace-with-a-named-branch-as-new-default/14991454#14991454</a>.</div>
<div><br></div><div>Tim Delaney</div></div></div></div>