Section: Git Manual (1)
Return to Main Contents
git-merge-one-file - The standard helper program to use with git-merge-index
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
This document was created by
using the manual pages.
Time: 21:47:28 GMT, January 23, 2018