git-gui: Honor core.excludesfile when listing extra files

diff --git a/lib/merge.tcl b/lib/merge.tcl
index 148d859c5c11022f68c4c4217953ac1cd3f1f8f1..f6a2df3c064b3132d7607211656a7aee53638881 100644 (file)
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
@@ -45,7 +45,7 @@ The rescan will be automatically started now.
 
 File [short_path $path] has merge conflicts.
 
-You must resolve them, add the file, and commit to complete the current merge.  Only then can you begin another merge.
+You must resolve them, stage the file, and commit to complete the current merge.  Only then can you begin another merge.
 "
                        unlock_index
                        return 0
@@ -219,16 +219,20 @@ You must finish amending this commit.
        if {![lock_index abort]} return
 
        if {[string match *merge* $commit_type]} {
-               set op merge
+               set op_question "Abort merge?
+
+Aborting the current merge will cause *ALL* uncommitted changes to be lost.
+
+Continue with aborting the current merge?"
        } else {
-               set op commit
-       }
+               set op_question "Reset changes?
 
-       if {[ask_popup "Abort $op?
+Resetting the changes will cause *ALL* uncommitted changes to be lost.
 
-Aborting the current $op will cause *ALL* uncommitted changes to be lost.
+Continue with resetting the current changes?"
+       }
 
-Continue with aborting the current $op?"] eq {yes}} {
+       if {[ask_popup $op_question] eq {yes}} {
                set fd [git_read read-tree --reset -u HEAD]
                fconfigure $fd -blocking 0 -translation binary
                fileevent $fd readable [namespace code [list _reset_wait $fd]]