aboutsummaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-06 16:03:22 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-06 16:03:22 -0700
commit1b118da8bd1878d78589afd9f755b9d52a9579ad (patch)
tree3bef12e4e07a0be6331a305522ae278a2b8cabe5 /git-gui/git-gui.sh
parentf22a432b157c5673a1004934a2e6ba77dd55b356 (diff)
parentca53c3fdcf69f620331f3822cef36d95b5cf5640 (diff)
downloadgit-1b118da8bd1878d78589afd9f755b9d52a9579ad.tar.gz
git-1b118da8bd1878d78589afd9f755b9d52a9579ad.tar.xz
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui: git-gui: Fix diff parsing for lines starting with "--" or "++" git-gui: Fix string escaping in po2msg.sh git gui: show diffs with a minimum of 1 context line git-gui: update all remaining translations to French. git-gui: Update french translation
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index ad65aaad5..86402d49f 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1932,7 +1932,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
}