# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1550058417 -3600
# Node ID cdc095c32e0124dcd13345c2708892108f4866e2
# Parent  4baf81dd2193944030090b7467268c9e8ba27abd# Parent  9a6cebfb596b8f5db1f01d5692e28709e072368d
branching: overwrite broken merge with a correct one

Thanks goes to Anton Shestakov for spotting and fixing this.