SYNOPSIS
--------
-'git-merge-one-file'
+'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'.
+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 <torvalds@osdl.org>,
-Junio C Hamano <
junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
+Junio C Hamano <
gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
Documentation
--------------