X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=dc8a96adb00c0b674e12e071a4a56f89bfe8583d;hb=f0e90716d47b429284702b75425a247c9fc41adb;hp=62e09afe13d48393b7dc2a734b416e5302088654;hpb=bb1ab2db08f48add4236a5a9c08aa1a6aa4d5d48;p=git.git

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 62e09afe1..dc8a96adb 100644
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -12,13 +12,13 @@ SYNOPSIS
 
 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
 --------------