Checkout
Johan Corveleyn
committed
on 12 Jul 18
* STATUS: Vote for conflict resolver fixes: r1830083 (issue #4739) and
r1833895 (issue #4744) groups.