X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=b7ccc201145e543c493df79cccd2a6c9aa03e210;hb=000182eacf99cde27d5916aa415921924b82972c;hp=5f1a748cede943a269c6ddf8f38dbcbe0aa8723d;hpb=ea88ee46de82bf1e398d0cfef05e3dcdf48b1b88;p=git.git

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