(refs #375)Show merge commit diffs correctly