git-gui: Expose the merge.diffstat configuration option

diff --git a/git-gui.sh b/git-gui.sh
index c5f132993295d7f915255071b4005e44003d8c3a..f87c12ea88a5a45a7a152afa462c690d454c51eb 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1262,6 +1262,7 @@ proc apply_config {} {
        }
 }
 
+set default_config(merge.diffstat) true
 set default_config(merge.summary) false
 set default_config(merge.verbosity) 2
 set default_config(user.name) {}