git-cvsexportcommit can't handle merge commits correctly