[PATCH V3 STABLE] amend: fix amending rename commit with diverged topologies (issue4405)

[Matt Mackall]

On Wed, 2014-10-22 at 11:53 -0700, Ryan McElroy wrote:
> # HG changeset patch
> # User Ryan McElroy <rmcelroy at fb.com>
> # Date 1413466506 25200
> #      Thu Oct 16 06:35:06 2014 -0700
> # Node ID 9cfb5bd8d8fa729cd1806574d53b9e0e8bfc605a
> # Parent  48c0b101a9de1fdbd638daa858da845cd05a6be7
> amend: fix amending rename commit with diverged topologies (issue4405)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.