-link:git-merge-one-file-script.html[git-merge-one-file-script]::
- The standard helper program to use with "git-merge-cache"
+link:git-merge-one-file.html[git-merge-one-file]::
+ The standard helper program to use with "git-merge-index"
+ Previously this command was known as git-merge-one-file-script.