diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-01 03:34:24 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-01 03:34:24 (GMT) |
| commit | 71a9db534a6bb4a6e9824c01b557a96ccaae0e89 (patch) | |
| tree | 8ab2a8437233dd6591593672d6e18d57d5cee43c /lib | |
| parent | a1388cf0361b133deaba5266211a34bdec66b7cc (diff) | |
| parent | b8848f7753762ff8c4e34b3c15e788c5f7e6781f (diff) | |
| download | git-71a9db534a6bb4a6e9824c01b557a96ccaae0e89.zip git-71a9db534a6bb4a6e9824c01b557a96ccaae0e89.tar.gz git-71a9db534a6bb4a6e9824c01b557a96ccaae0e89.tar.bz2 | |
Merge branch 'maint'
* maint:
git-gui: Allow as few as 0 lines of diff context
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diff.tcl | 2 | ||||
| -rw-r--r-- | lib/option.tcl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 7e715a6..29436b5 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -145,7 +145,7 @@ proc show_diff {path w {lno {}}} { lappend cmd -p lappend cmd --no-color - if {$repo_config(gui.diffcontext) > 0} { + if {$repo_config(gui.diffcontext) >= 0} { lappend cmd "-U$repo_config(gui.diffcontext)" } if {$w eq $ui_index} { diff --git a/lib/option.tcl b/lib/option.tcl index 4924b9a..ba2a723 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] |