index 427cdefd01b7cffad3d00efe029c012709b3a389..637b53f898829af98153d60953434fa30e3df179 100644 (file)
-n::
--no-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::
--summary::
--no-summary::