diff options
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 7c25bb9808..9df49710e1 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -601,6 +601,7 @@ proc apply_config {} { } } +set default_config(branch.autosetupmerge) true set default_config(merge.diffstat) true set default_config(merge.summary) false set default_config(merge.verbosity) 2 |