Allow merge args to git-catchup