Merge branch 'ks/maint-mailinfo-folded'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 007909a82fe77325e46c54799d00dc78493a47f9..637b53f898829af98153d60953434fa30e3df179 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,10 +1,18 @@
+-q::
+--quiet::
+       Operate quietly.
+
+-v::
+--verbose::
+       Be verbose.
+
 --stat::
        Show a diffstat at the end of the merge. The diffstat is also
        controlled by the configuration option merge.stat.
 
 -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::