From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Tue, 7 Apr 2009 15:33:35 +0000 (+0200)
Subject: git-gui: Ensure consistent usage of mergetool.keepBackup
X-Git-Tag: v1.6.3-rc4~1^2~3^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb25092a88ba889f540beaf9acdb208421ce2a20;p=git.git

git-gui: Ensure consistent usage of mergetool.keepBackup

In several places merge.keepBackup is used i.s.o.
mergetool.keepBackup. This patch makes it all
consistent.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index b70e1598d..5404f7e4b 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -699,7 +699,7 @@ proc apply_config {} {
 
 set default_config(branch.autosetupmerge) true
 set default_config(merge.tool) {}
-set default_config(merge.keepbackup) true
+set default_config(mergetool.keepbackup) true
 set default_config(merge.diffstat) true
 set default_config(merge.summary) false
 set default_config(merge.verbosity) 2
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index 3e1b42beb..3fe90e697 100644
--- 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"
 		}