diff options
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 55bc367479..b05e0cee11 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -159,7 +159,7 @@ linkgit:gitattributes[5] Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation |