[PATCH 2 of 7 v2] merge: change priority / ordering of merge actions

[Pierre-Yves David]

On 05/08/2014 05:06 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1398985754 -7200
> #      Fri May 02 01:09:14 2014 +0200
> # Node ID 8b9f6a2e0d19791662c8c8544594a74c0d0d4276
> # Parent  b987a7a84823bf808939e4ac1838a5c963f510cd
> merge: change priority / ordering of merge actions

This changeset bread test-add.t can you look at it?

Patch 8 eventually fixes it but I do not like having broken test. This 
hurt bisect feeling. Series looks otherwise fine.

-- 
Pierre-Yves David