[PATCH 9 of 9] shelve: better (and slightly redundant) test coverage for unshelve conflicts

[Matt Mackall]

On Mon, 2014-02-10 at 01:01 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1391990080 -3600
> #      Mon Feb 10 00:54:40 2014 +0100
> # Node ID b434291a395690f0477e5e38209ab66517797147
> # Parent  18170d3588ff3bcce64a866e1db848b8bfb371b2
> shelve: better (and slightly redundant) test coverage for unshelve conflicts

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.