git-merge-one-file - The standard helper program to use with git-merge-index
git merge-one-file
GIT-MERGE-ONE-FIL(1) Git Manual GIT-MERGE-ONE-FIL(1) 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 ATTRIBUTES See attributes(5) for descriptions of the following attributes: +---------------+--------------------------+ |ATTRIBUTE TYPE | ATTRIBUTE VALUE | +---------------+--------------------------+ |Availability | developer/versioning/git | +---------------+--------------------------+ |Stability | Uncommitted | +---------------+--------------------------+ NOTES This software was built from source available at https://java.net/projects/solaris-userland. The original community source was downloaded from https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.xz Further information about this software can be found on the open source community website at http://git-scm.com/. Git 2.7.4 03/17/2016 GIT-MERGE-ONE-FIL(1)