Merge branch 'ss/mergetools-tortoise'

diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index daf1782a31cb2dee704a6895939afa638d3736fc..4ed71c76cb4ee7855521b1a04c2bddf6d63d23a8 100644 (file)
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -254,7 +254,7 @@ pattern.  Filepairs that match a glob pattern on an earlier line
 in the file are output before ones that match a later line, and
 filepairs that do not match any glob pattern are output last.
 
-As an example, a typical orderfile for the core git probably
+As an example, a typical orderfile for the core Git probably
 would look like this:
 
 ------------------------------------------------