diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh index 0b15924006..793c015550 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -212,6 +212,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 |