X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=637b53f898829af98153d60953434fa30e3df179;hb=d1983677f75469d177b0b948f0b66ad3471a26a2;hp=427cdefd01b7cffad3d00efe029c012709b3a389;hpb=ed56049058284d7df2ede1ce5f494a2a9a109479;p=git.git diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 427cdefd0..637b53f89 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -12,7 +12,7 @@ -n:: --no-stat:: - Do not show diffstat at the end of the merge. + Do not show a diffstat at the end of the merge. --summary:: --no-summary::