[PATCH 6 of 6 mergedriver] filemerge: call premerge directly from main merge function

[Pierre-Yves David]

On 10/08/2015 12:33 AM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1444278136 25200
> #      Wed Oct 07 21:22:16 2015 -0700
> # Node ID 8b73dc446e92cf163589e5ac97daad7b54317077
> # Parent  57d94e0c31e4072ffdf0aa4a7fa2934e22dfe068
> filemerge: call premerge directly from main merge function

that one have been pushed to the clowncopter too.

-- 
Pierre-Yves David