[PATCH 11 of 16] merge: keep destination filename as key in filemerge actions

[Matt Mackall]

On Sun, 2014-03-02 at 20:15 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1393782736 -3600
> #      Sun Mar 02 18:52:16 2014 +0100
> # Node ID ee728599ef740d08cc0b8f102d3dc6325f48120b
> # Parent  6b0a190609ec080ff606f676bcebea54c89fc46f
> merge: keep destination filename as key in filemerge actions

I've queued 9, 10, and 11, thanks.

-- 
Mathematics is the supreme nostalgia of our time.