Merge branch 'rr/tests-dedup-test-config' into maint

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 73ca7025a39630907e3a019dfed14542f4ac7538..e0e12e947034b3f690d7f103ee90e0bc1a21f926 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-'git difftool' is a git command that allows you to compare and edit files
+'git difftool' is a Git command that allows you to compare and edit files
 between revisions using common diff tools.  'git difftool' is a frontend
 to 'git diff' and accepts the same options and arguments. See
 linkgit:git-diff[1].