Fix diffstat regex for merge commits