Merge branch 'ls/travis-enable-httpd-tests'

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 6ade00217606cd111811dcd5777df5c66bb9bf39..a68d860fa3e9b63bf8ae76b93011bd9b49ecda25 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -82,7 +82,7 @@ linkgit:git-rev-list[1] for a complete list.
 
 --simplify-merges::
 
-       Additional option to '--full-history' to remove some needless
+       Additional option to `--full-history` to remove some needless
        merges from the resulting history, as there are no selected
        commits contributing to this merge.  (See "History
        simplification" in linkgit:git-log[1] for a more detailed