Comment 3 for bug 51980

Well, in those circumstances, the merge should be shown, because it does change the file contents.

But I would agree that we shouldn't show all of the revisions that were merged by that change.

I don't believe Larstiq's current log updates modify this behavior, but it might.