X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-fmt-merge-msg.txt;h=1c24796d66d5aeaeeccfd152c69cddba1953fd6c;hb=cef5775b9f640beb51b07f8a296cfcc9b11b9744;hp=885edf005a8442dba6f509751f67f8c0e1939a08;hpb=fab600ce2ed086ba87499ffe3c35c46f85e7ab61;p=git.git

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 885edf005..1c24796d6 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -61,7 +61,7 @@ linkgit:git-merge[1]
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------