From 866b973b5d418622cbe28fea85169379dcb30f9d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 30 May 2005 17:45:41 -0700 Subject: [PATCH] git-resolve-script: use "git-apply --stat" instead of diffstat Not everybody necessarily even has diffstat installed. --- git-resolve-script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-resolve-script b/git-resolve-script index 5f1a748c..b7ccc201 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -41,7 +41,7 @@ if [ "$common" == "$head" ]; then sleep 3 git-read-tree -m $merge && git-checkout-cache -f -u -a echo $merge > "$GIT_DIR"/HEAD - git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 + git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat exit 0 fi echo "Trying to merge $merge into $head" @@ -58,4 +58,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me echo "Committed merge $result_commit" echo $result_commit > "$GIT_DIR"/HEAD git-checkout-cache -f -u -a -git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 +git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat -- 2.11.0