Handle merge commits properly.
regex support