[PATCH 3 of 3] merge: clarify warning for (not) merging flags without ancestor

[Pierre-Yves David]

On 10/12/2016 12:25 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1476267738 -7200
> #      Wed Oct 12 12:22:18 2016 +0200
> # Node ID 9588752fc3a6d2b5b1f40ddfc48965997270892d
> # Parent  29bd20c4999865fc19ca3f0344c2c1231a318b1c
> merge: clarify warning for (not) merging flags without ancestor

Pushed, thanks

-- 
Pierre-Yves David