diff options
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 2 |
1 files changed, 1 insertions, 1 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 |