[PATCH] merge: move messages about possible conflicts a litte earlier

[Pierre-Yves David]

On 11/12/2015 01:17 PM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1447362843 28800
> #      Thu Nov 12 13:14:03 2015 -0800
> # Node ID d3a0a07dd059f56be7392d95d147fb4c382d7b14
> # Parent  150fb782ef80919e1c8cc7d4b047d78f889c7846
> merge: move messages about possible conflicts a litte earlier
>
> I actually wanted to reduce the amount of code around the call to
> applyupdates(), so I tried moving these warnings a little earlier, and
> I think it makes the output make a little more sense (see changes to
> test cases).

This make sense, pushed to the clowncopter. Thanks.

-- 
Pierre-Yves David