[PATCH 2 of 2 STABLE] transplant: restore dirstate correctly at unexpected failure

[Matt Mackall]

On Thu, 2015-07-30 at 06:24 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1438204929 -32400
> #      Thu Jul 30 06:22:09 2015 +0900
> # Branch stable
> # Node ID 99e88320d665e42d5da4d0090b764404d8151e15
> # Parent  800e090e9c64a58d6ae312f2d8c2565a605fe322
> transplant: restore dirstate correctly at unexpected failure

These are queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.