Fix the display of merge conflict details

This was broken on both Linux and Windows by the fix for WS-139 (which
deleted too much code), and was already broken on Linux in the same way
as WS-139.