diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2009-04-08 07:41:13 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-04-08 07:41:13 -0700 |
| commit | 4339d5109c847fc938cd8405001ffde4d230c09f (patch) | |
| tree | e55511718d7d17fb939e398f3cdd17c0e25fa9df | |
| parent | b01d4326040ec6b9d98baba32091c9458fc809d4 (diff) | |
| parent | fb25092a88ba889f540beaf9acdb208421ce2a20 (diff) | |
| download | git-4339d5109c847fc938cd8405001ffde4d230c09f.tar.gz git-4339d5109c847fc938cd8405001ffde4d230c09f.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
| -rwxr-xr-x | git-gui.sh | 3 | ||||
| -rw-r--r-- | lib/mergetool.tcl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index e4a9230ea..c8f850d1e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -722,7 +722,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 @@ -1131,6 +1131,7 @@ set current_diff_path {} set is_3way_diff 0 set is_conflict_diff 0 set selected_commit_type new +set diff_empty_count 0 set nullid "0000000000000000000000000000000000000000" set nullid2 "0000000000000000000000000000000000000001" 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" } |