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