git-gui: stop using deprecated merge syntax

diff --git a/lib/index.tcl b/lib/index.tcl
index 014acf93198d3ef3bc347a65b6129121b1228f09..74a81a7b42779c006fb0c0060724359fca2b33d9 100644 (file)
--- a/lib/index.tcl
+++ b/lib/index.tcl
@@ -367,7 +367,20 @@ proc do_add_all {} {
                }
        }
        if {[llength $untracked_paths]} {
-               set reply [ask_popup [mc "Stage also untracked files?"]]
+               set reply 0
+               switch -- [get_config gui.stageuntracked] {
+               no {
+                       set reply 0
+               }
+               yes {
+                       set reply 1
+               }
+               ask -
+               default {
+                       set reply [ask_popup [mc "Stage %d untracked files?" \
+                                                                         [llength $untracked_paths]]]
+               }
+               }
                if {$reply} {
                        set paths [concat $paths $untracked_paths]
                }
@@ -401,7 +414,7 @@ proc revert_helper {txt paths} {
        # such distinction is needed in some languages. Previously, the
        # code used "Revert changes in" for both, but that can't work
        # in languages where 'in' must be combined with word from
-       # rest of string (in diffrent way for both cases of course).
+       # rest of string (in different way for both cases of course).
        #
        # FIXME: Unfortunately, even that isn't enough in some languages
        # as they have quite complex plural-form rules. Unfortunately,