Current: /usr/libexec/git-core/git-merge-octopus

New name: