Git

git-merge-one-file last updated in 2.34.1

NAME

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

git merge-one-file

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.

Part of the git[1] suite