git-merge-one-file
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.
© 2012–2021 Scott Chacon and others
Licensed under the MIT License.
https://git-scm.com/docs/git-merge-one-file