git-merge-one-file(1) on Linux

The text 316bfc127845, as Debian 6.0 (Squeeze) shipped it.

The standard helper program to use with git-merge-index

git-merge-one-file(1) on Linux now