diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-01 15:39:56 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-01 15:39:56 -0700 |
| commit | 961a628fdd79a30188b0f76be98b3c1db8e13389 (patch) | |
| tree | 9703c203a5a6006bc4c0ccb2a19ccda1cfd807b5 /git-gui.sh | |
| parent | f7078b40917daa20ea3fa54c7e38766594e4b996 (diff) | |
| parent | 9dc3793166db8f3b80b909e2cb3ac3c5d0a611d5 (diff) | |
| download | git-961a628fdd79a30188b0f76be98b3c1db8e13389.tar.gz git-961a628fdd79a30188b0f76be98b3c1db8e13389.tar.xz | |
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
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index ec08b5a92..99de1a257 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1947,7 +1947,7 @@ proc show_more_context {} { proc show_less_context {} { global repo_config - if {$repo_config(gui.diffcontext) >= 1} { + if {$repo_config(gui.diffcontext) > 1} { incr repo_config(gui.diffcontext) -1 reshow_diff } |