[PATCH 3 of 3] update: don't overwrite untracked ignored files on update

[Matt Mackall]

On Tue, 2014-12-02 at 17:42 -0800, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1416210104 28800
> #      Sun Nov 16 23:41:44 2014 -0800
> # Node ID e837bee59fc3df279161982e1c651e89aad934cc
> # Parent  580066d004512f5fabbf83d1a47d09af1546edd5
> update: don't overwrite untracked ignored files on update

This looks like a bug fix, so I'm going to queue these two for stable
(with the BROKEN line dropped).

-- 
Mathematics is the supreme nostalgia of our time.