[PATCH STABLE] merge: do not delete untracked files silently (issue5962)

Mon Aug 20 12:08:31 EDT 2018

On Sat, Aug 18, 2018 at 11:22 PM Yuya Nishihara <yuya at tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1534652822 -32400
> #      Sun Aug 19 13:27:02 2018 +0900
> # Branch stable
> # Node ID 2b31e27533b32ea25f2758d7214e46dac8b0fb1d
> # Parent  cee9043c7dba154af10cf2817190f8c1ed62de62
> merge: do not delete untracked files silently (issue5962)
>

Queued, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20180820/e7c5989c/attachment.html>