Name
git-merge-one-file - The standard helper program to use with git-merge-index Synopsis
git merge-one-file
Description
This is the standard helper program to use with git merge-index to resolve a merge after the trivial merge done with git read-tree -m. Git
Part of the git(1) suite