1git-merge-one-file(1) 2===================== 3v0.99.4, Aug 2005 4 5NAME 6---- 7git-merge-one-file - The standard helper program to use with "git-merge-index" 8 9 10SYNOPSIS 11-------- 12'git-merge-one-file' 13 14DESCRIPTION 15----------- 16This is the standard helper program to use with "git-merge-index" 17to resolve a merge after the trivial merge done with "git-read-tree -m". 18 19Author 20------ 21Written by Linus Torvalds <torvalds@osdl.org>, 22Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>. 23 24Documentation 25-------------- 26Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 27 28GIT 29--- 30Part of the gitlink:git[7] suite 31