Current: /usr/libexec/git-core/git-merge-one-file

New name: