Merge branch 'sb/line-log-plug-pairdiff-leak' into maint

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 23c9ae72a43c3f2b6ac0409ded488869f3b2de0d..b5b6b2fea6c29ce7f1deb9e2c23060b92fbd83e4 100644 (file)
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -161,6 +161,7 @@ proc do_options {} {
                {b gui.warndetachedcommit {mc "Warn before committing to a detached head"}}
                {s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}}
                {b gui.displayuntracked {mc "Show untracked files"}}
+               {i-1..99 gui.tabsize {mc "Tab spacing"}}
                } {
                set type [lindex $option 0]
                set name [lindex $option 1]