git-merge-one-file - The standard helper program to use with git-merge-index
git merge-one-file
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.
Written by Linus Torvalds <[email protected]>, Junio C Hamano <[email protected]> and Petr Baudis <[email protected]>.
Documentation by David Greaves, Junio C Hamano and the git-list <[email protected]>.
Part of the git(1) suite