replay: support replaying 2-parent merges#2106

dscho wants to merge 11 commits into

gitgitgadget:mastergitgitgadget/git:masterfrom

dscho:support-merge-commits-in-git-historydscho/git:support-merge-commits-in-git-historyCopy head branch name to clipboard