Tutorial: adjust merge example to recursive strategy.

diff --git a/git-count-objects.sh b/git-count-objects.sh
index fc61a1a987d45bc73bcee805e9010c5ac96ea66a..d6e9a3221f1f63142d9490e9abdfc5c8ac8d6348 100755 (executable)
--- a/git-count-objects.sh
+++ b/git-count-objects.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup || die "Not a git repository"
+. git-sh-setup
 
 dc </dev/null 2>/dev/null || {
        # This is not a real DC at all -- it just knows how