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>
Ferry Huberts committed
Apr 7, 2009 at 17:33 UTC
fb25092a88ba889f540beaf9acdb208421ce2a20
2 files changed
+2
-2
git-gui.sh
+1
-1
@@ -699,7 +699,7 @@ proc apply_config {} {
699
700
set default_config(branch.autosetupmerge) true
701
set default_config(merge.tool) {}
702
-set default_config(merge.keepbackup) true
702
+set default_config(mergetool.keepbackup) true
703
set default_config(merge.diffstat) true
704
set default_config(merge.summary) false
705
set default_config(merge.verbosity) 2
lib/mergetool.tcl
+1
-1
@@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {
382
delete_temp_files $mtool_tmpfiles
383
ui_status [mc "Merge tool failed."]
384
} else {
385
- if {[is_config_true merge.keepbackup]} {
385
+ if {[is_config_true mergetool.keepbackup]} {
386
file rename -force -- $backup "$mtool_target.orig"
387
}
388