test: use numstat instead of diffstat in binary-diff test

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 0bd290b4ae990df4e0553700fa4fa38696e2b980..faae82071985e756af18f2f5644b8a4a2bb3bd03 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -380,7 +380,9 @@ do
        -i|--interactive)
                interactive=t ;;
        -b|--binary)
-               : ;;
+               echo >&2 "The -b/--binary option was deprecated in 1.6.0 and removed in 1.7.10."
+               die "Please adjust your scripts."
+               ;;
        -3|--3way)
                threeway=t ;;
        -s|--signoff)