From: Ferry Huberts Date: Fri, 10 Apr 2009 19:33:56 GMT Subject: [PATCH v3 1/2] Ensure consistent usage of mergetool.keepBackup in git-gui Message-ID: In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent for git-gui Signed-off-by: Ferry Huberts --- Based on pu Shawn, I think you said you already applied this, I'm still resending to keep the series complete. git-gui/git-gui.sh | 2 +- git-gui/lib/mergetool.tcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index e018e07..e4e643a 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/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/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index eb2b4b5..b7263b3 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/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" } -- 1.6.0.6