[PATCH] merge: demonstrate that directory renames can lose local file content

[Pierre-Yves David]

On 12/02/2014 01:42 PM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1417555687 28800
> #      Tue Dec 02 13:28:07 2014 -0800
> # Node ID 4e23f3d47f4288b78d4714db32457ed8759844be
> # Parent  19ebd2f88fc77282efe724b30de8750f79771e8f
> merge: demonstrate that directory renames can lose local file content

Pushed to the clowncopter, thanks.

-- 
Pierre-Yves David