From 9d76812b42009069aa3ff8f29e51b5150aa04e8e Mon Sep 17 00:00:00 2001
From: Sean <seanlkml@sympatico.ca>
Date: Sun, 14 May 2006 08:16:06 -0400
Subject: Convert some "apply --summary" users to "diff --summary".

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 git-merge.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'git-merge.sh')

diff --git a/git-merge.sh b/git-merge.sh
index b834e79c9..af1f25b3c 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -55,8 +55,7 @@ finish () {
 
 	case "$no_summary" in
 	'')
-		git-diff-tree -p -M "$head" "$1" |
-		git-apply --stat --summary
+		git-diff-tree -p --stat --summary -M "$head" "$1"
 		;;
 	esac
 }
-- 
cgit v1.2.1