Merge branch 'po/range-doc' into maint

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index a68d860fa3e9b63bf8ae76b93011bd9b49ecda25..e382dd96dfded769a27c2295ebc096c15214713b 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -70,7 +70,7 @@ linkgit:git-rev-list[1] for a complete list.
 
 --left-right::
 
-       Mark which side of a symmetric diff a commit is reachable
+       Mark which side of a symmetric difference a commit is reachable
        from.  Commits from the left side are prefixed with a `<`
        symbol and those from the right with a `>` symbol.