Merge branch 'maint'

* maint:
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line

Conflicts:
lib/option.tcl

diff --cc git-gui.sh
Simple merge

diff --cc lib/option.tcl
index eb958ffd47bf6b4be5b61a45191079dff99331a2,5e1346e601faf90114e9c62f11144f812835e872..2d4b97b7d3fb90d8c6575b4d4e645d52104b89c1
--- 1/lib/option.tcl
--- 2/lib/option.tcl
+++ b/lib/option.tcl
@@@ -125,8 -125,7 +125,8 @@@ proc do_options {} 
                {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
                {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
                {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
-               {i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
 +              {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
+               {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
                {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                } {