Merge history test 1: Difference between revisions