Merge branch 'maint'

diff --git a/lib/option.tcl b/lib/option.tcl
index 9f76f0294eb5c855c65b1531dc5d29fe3a82c565..ba2a723fce1b1cef8f4fc166e60e842e63c9842d 100644 (file)
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -184,10 +184,11 @@ proc do_options {} {
 
                {b merge.summary {Summarize Merge Commits}}
                {i-1..5 merge.verbosity {Merge Verbosity}}
+               {b merge.diffstat {Show Diffstat After Merge}}
 
                {b gui.trustmtime  {Trust File Modification Timestamps}}
                {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
-               {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
+               {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {
                set type [lindex $option 0]