[PATCH] graft: use a real conflict for the tests

[Matt Mackall]

On Wed, 2014-12-03 at 16:26 -0800, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1417647809 28800
> #      Wed Dec 03 15:03:29 2014 -0800
> # Node ID f2c43d2cf64904f44c5e938569c3709cece5a8f5
> # Parent  a8bef08d7311fc5cede319e3ce730c35bca2cbba
> graft: use a real conflict for the tests

Sure, queued for default.

-- 
Mathematics is the supreme nostalgia of our time.