[PATCH STABLE] resolve: restore .orig only after merge is fully complete (issue4952)

[Pierre-Yves David]

On 11/13/2015 03:56 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1447458962 28800
> #      Fri Nov 13 15:56:02 2015 -0800
> # Branch stable
> # Node ID 08e5dcae034817491d156cec7934139c469a47eb
> # Parent  8a256cee72c890c761918ec1d244b286694ac51b
> resolve: restore .orig only after merge is fully complete (issue4952)

This is pushed to the clowcopter, thanks for the quick regression fix.

-- 
Pierre-Yves David