[PATCH 3 of 6 mergedriver] filemerge: in ':fail' tool, write out other side if local side is deleted

Martin von Zweigbergk martinvonz at google.com
Sat Nov 28 22:57:17 CST 2015


On Sat, Nov 28, 2015 at 5:56 PM Siddharth Agarwal <sid at less-broken.com>
wrote:

> On 11/27/15 22:21, Martin von Zweigbergk wrote:
> >
> > No tests affected? Should we add one?
>
> Nothing's affected because change/delete conflicts aren't going through
> this code yet.


Oh,  of course. Sorry about my stupid questions :-P
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151129/5bd8313d/attachment.html>


More information about the Mercurial-devel mailing list