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".

Author

Written by Linus Torvalds <[email protected]>, Junio C Hamano <[email protected]> and Petr Baudis <[email protected]>.

Documentation

Documentation by David Greaves, Junio C Hamano and the git-list <[email protected]>.

GIT

Part of the git(7) suite