gitweb: embed snapshot format parameter in PATH_INFO

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index ffbc6e9861094f48fd3f24af3a0b343c9c0ea7f4..007909a82fe77325e46c54799d00dc78493a47f9 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -56,5 +56,5 @@
        Use the given merge strategy; can be supplied more than
        once to specify them in the order they should be tried.
        If there is no `-s` option, a built-in list of strategies
-       is used instead (`git-merge-recursive` when merging a single
-       head, `git-merge-octopus` otherwise).
+       is used instead ('git-merge-recursive' when merging a single
+       head, 'git-merge-octopus' otherwise).