[PATCH 3 of 3 unshelve] unshelve: add support for custom merge tools

[Pierre-Yves David]

On 11/18/2015 03:20 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1447888283 28800
> #      Wed Nov 18 15:11:23 2015 -0800
> # Node ID 7695d092615fafae933758ca8074b8d30a6fa866
> # Parent  bcb5b0e95269d5797fcdd1ba5610afa681c62d47
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 7695d092615f
> unshelve: add support for custom merge tools

This is gold. Thanks. Pushed to the clowncopter.

-- 
Pierre-Yves David