carta

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

The text 4ba8cd990f95, as Debian 7 (Wheezy) shipped it.

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

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