[PATCH] merge: add test with conflicting file and remote directory rename

[Matt Mackall]

On Wed, 2014-12-03 at 10:06 -0800, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1417629684 28800
> #      Wed Dec 03 10:01:24 2014 -0800
> # Node ID 420f46b5d327725bda711cde95da34a47f0aec24
> # Parent  fc76f55705eb5884707c977ecb756aee7c794676
> merge: add test with conflicting file and remote directory rename

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.