Merge history test: Difference between revisions