git-merge-one-file(1) on Linux
The text f2dc157ac8b2, as Debian 5.0 (Lenny) shipped it.
The standard helper program to use with git-merge-index
The text f2dc157ac8b2, as Debian 5.0 (Lenny) shipped it.
The standard helper program to use with git-merge-index