Add a scrollbar to the error dialog (#1021506).
    
    The error message might potentially be very long, like in the case of file
    conflicts.  So just support always being able to pop up a scrollbar if needed.