E2E test of merge-ref diffs (including comments)

Edited by Mark Lapierre