Bug 19335: Fix 00-merge-conflict-markers.t when dockerised