Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3600: Use test prerequisite tags
[gitweb.git]
/
Documentation
/
merge-options.txt
diff --git
a/Documentation/merge-options.txt
b/Documentation/merge-options.txt
index 427cdefd01b7cffad3d00efe029c012709b3a389..637b53f898829af98153d60953434fa30e3df179 100644
(file)
--- 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::