aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index af1f25b3c..da5657eb4 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -55,7 +55,7 @@ finish () {
case "$no_summary" in
'')
- git-diff-tree -p --stat --summary -M "$head" "$1"
+ git-diff-tree --stat --summary -M "$head" "$1"
;;
esac
}