X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=007909a82fe77325e46c54799d00dc78493a47f9;hb=3df6499c227c28310b545edc42cdbd713ee0898a;hp=ffbc6e9861094f48fd3f24af3a0b343c9c0ea7f4;hpb=1947bdbc31e8e1419bdfe90d2357c68919189c30;p=git.git diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index ffbc6e986..007909a82 100644 --- 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).