diff options
| author | Ferry Huberts <ferry.huberts@pelagic.nl> | 2009-04-07 17:33:35 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-04-08 07:40:58 -0700 |
| commit | fb25092a88ba889f540beaf9acdb208421ce2a20 (patch) | |
| tree | a96c6607704f2d74840ccebb6d6c47e7b715d579 | |
| parent | 8052e788b5e9ae2e2d06b5050fa73394ffe0993a (diff) | |
| download | git-fb25092a88ba889f540beaf9acdb208421ce2a20.tar.gz | |
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>
| -rwxr-xr-x | git-gui.sh | 2 | ||||
| -rw-r--r-- | lib/mergetool.tcl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index b70e1598dc..5404f7e4b5 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 3e1b42beb0..3fe90e6970 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" } |