This field doesn't do anything, it just parses the "Conflicts:" field which `git` can insert after a merge, so we don't squish the field value into some other field.
This field doesn't do anything, it just parses the "git-svn-id" field which `git svn` inserts into commit messages so that we don't end up mangling some other field.