[PATCH 3/6] add 'merge.stat' config variable

["SZEDER Gábor" <szeder@ira.uka.de>]

This variable has the same effect, as 'merge.diffstat'.
Also mention it in the documentation.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 Documentation/merge-config.txt  |    4 ++++
 Documentation/merge-options.txt |    2 +-
 git-merge.sh                    |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index cc815cc..6d0a797 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,3 +1,7 @@
+merge.stat::
+	Whether to print the diffstat berween ORIG_HEAD and merge result
+	at the end of the merge.  True by default.
+
 merge.summary::
 	Whether to include summaries of merged commits in newly created
 	merge commit messages. False by default.
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index bc81580..b89ace8 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,6 +1,6 @@
 --stat::
 	Show a diffstat at the end of the merge. The diffstat is also
-	controlled by the configuration option merge.diffstat.
+	controlled by the configuration option merge.stat.
 
 -n, \--no-stat::
 	Do not show diffstat at the end of the merge.
diff --git a/git-merge.sh b/git-merge.sh
index 1b693ad..004e367 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -210,6 +210,7 @@ while test $args_left -lt $#; do shift; done
 
 if test -z "$show_diffstat"; then
     test "$(git config --bool merge.diffstat)" = false && show_diffstat=false
+    test "$(git config --bool merge.stat)" = false && show_diffstat=false
     test -z "$show_diffstat" && show_diffstat=t
 fi
 
-- 
1.5.5.rc3.9.gba703