Teach "delta" attribute to pack-objects.

diff --git a/git-merge.sh b/git-merge.sh
index 7ebbce4bdbaf243a7a5612c024216b8ccf8eae44..351676f6d4a39c1ac682296781f4f5c8d1a3053d 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -90,7 +90,8 @@ finish () {
        ?*)
                case "$no_summary" in
                '')
-                       git-diff-tree --stat --summary -M "$head" "$1"
+                       # We want color (if set), but no pager
+                       GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
                        ;;
                esac
                ;;