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