1 .\"Generated by db2man.xsl. Don't modify this, modify the source.
10 .de Sp \" Vertical space (when we can't use .PP)
16 .ie \\n(.$>=3 .ne \\$3
20 .TH "GIT-MERGE-ONE-FILE" 1 "" "" ""
22 git-merge-one-file \- The standard helper program to use with "git-merge-index"
31 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"\&.
36 Written by Linus Torvalds <torvalds@osdl\&.org>, Junio C Hamano <junkio@cox\&.net> and Petr Baudis <pasky@suse\&.cz>\&.
41 Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
46 Part of the \fBgit\fR(7) suite