diff --git a/git-resolve-script b/git-resolve-script
index 5f1a748cede943a269c6ddf8f38dbcbe0aa8723d..b7ccc201145e543c493df79cccd2a6c9aa03e210 100644 (file)
--- a/git-resolve-script
+++ b/git-resolve-script
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"
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