git-gui: handle meta diff header lines only in the header section

diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 3e1b42beb0d05f12a6fe7913aff14091cecac32c..3fe90e697002baaa1c5fa8df4c3d3eae199b062d 100644 (file)
--- a/lib/mergetool.tcl
+++ b/lib/mergetool.tcl
@@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {
                delete_temp_files $mtool_tmpfiles
                ui_status [mc "Merge tool failed."]
        } else {
-               if {[is_config_true merge.keepbackup]} {
+               if {[is_config_true mergetool.keepbackup]} {
                        file rename -force -- $backup "$mtool_target.orig"
                }