Align merge commit diff behavior with first-parent semantics in but-core and update regression coverage

Align merge commit diff behavior with first-parent semantics in but-core and update regression coverage #1191