Fix #5633 - preview diffs before merge