git-merge-one-file
The standard helper program to use with git-merge-index
- Provided by: git-man (Version: 1:1.9.1-1ubuntu0.10)
- Source: git
- Report a bug
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