GIT-MERGE-ONE-FILE(1) Git Manual GIT-MERGE-ONE-FILE(1)NAME
git-merge-one-file - The standard helper program to use with git-merge-indexSYNOPSIS
git merge-one-fileDESCRIPTION
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 Git 2.41.0 2023-06-01 GIT-MERGE-ONE-FILE(1)