Merge branch 'maint'

* maint:
  git-gui: Allow as few as 0 lines of diff context

diff --cc git-gui.sh
Simple merge

diff --cc lib/option.tcl
index 4924b9a,11dd9be..ba2a723
--- 1/lib/option.tcl
--- 2/lib/option.tcl
+++ b/lib/option.tcl
@@@ -184,11 -171,9 +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}}
-               {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
 +              {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
+               {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {
                set type [lindex $option 0]