diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-31 23:34:24 -0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-05-31 23:34:24 -0400 |
commit | 71a9db534a6bb4a6e9824c01b557a96ccaae0e89 (patch) | |
tree | 8ab2a8437233dd6591593672d6e18d57d5cee43c /lib/option.tcl | |
parent | a1388cf0361b133deaba5266211a34bdec66b7cc (diff) | |
parent | b8848f7753762ff8c4e34b3c15e788c5f7e6781f (diff) | |
download | git-71a9db534a6bb4a6e9824c01b557a96ccaae0e89.tar.gz |
Merge branch 'maint'
* maint:
git-gui: Allow as few as 0 lines of diff context
Diffstat (limited to 'lib/option.tcl')
-rw-r--r-- | lib/option.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/option.tcl b/lib/option.tcl index 4924b9aa56..ba2a723fce 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -188,7 +188,7 @@ proc do_options {} { {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] |