From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 1 Sep 2008 22:39:56 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~3^2~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=961a628fdd79a30188b0f76be98b3c1db8e13389;p=git.git

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
---

961a628fdd79a30188b0f76be98b3c1db8e13389
diff --cc lib/option.tcl
index eb958ffd4,5e1346e60..2d4b97b7d
--- a/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..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
- 		{i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
+ 		{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"}}
  		} {