git-gui: Minor refactoring of merge command line in merge support

[git.git] / lib / commit.tcl

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 6b86f9808e98c04f99458b93bbae92732a06cc8f..f857a2ff5bb3d0e151ea471a16a1b233117afc70 100644 (file)
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -153,7 +153,7 @@ The rescan will be automatically started now.
                U? {
                        error_popup "Unmerged files cannot be committed.
 
-File [short_path $path] has merge conflicts.  You must resolve them and add the file before committing.
+File [short_path $path] has merge conflicts.  You must resolve them and stage the file before committing.
 "
                        unlock_index
                        return
@@ -169,7 +169,7 @@ File [short_path $path] cannot be committed by this program.
        if {!$files_ready && ![string match *merge $curType]} {
                info_popup {No changes to commit.
 
-You must add at least 1 file before you can commit.
+You must stage at least 1 file before you can commit.
 }
                unlock_index
                return
@@ -381,7 +381,7 @@ A rescan will be automatically started now.
        $ui_comm edit modified false
        if {$::GITGUI_BCK_exists} {
                catch {file delete [gitdir GITGUI_BCK]}
-               set $::GITGUI_BCK_exists 0
+               set ::GITGUI_BCK_exists 0
        }
 
        if {[is_enabled singlecommit]} do_quit