git-merge-one-file(1) on Linux
The text 9a456a35e3c4, as Debian 8 (Jessie) shipped it.
The standard helper program to use with git-merge-index
The text 9a456a35e3c4, as Debian 8 (Jessie) shipped it.
The standard helper program to use with git-merge-index