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
Git 1.7.7 09/30/2011 GIT-MERGE-ONE-FIL(1)
git 1.7.7 - Generated Sun Oct 23 06:00:44 CDT 2011