Make sure the empty tree exists when needed in merge-recursive.

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 8baf2fef69ba6a67641d2b9ba4dc44468aa31ada..b5ceba4acfd8e862cfc5a77672241e07205f70ea 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -4,6 +4,7 @@
 check_count () {
        head=
        case "$1" in -h) head="$2"; shift; shift ;; esac
+       echo "$PROG file $head" >&4
        $PROG file $head >.result || return 1
        cat .result | perl -e '
                my %expect = (@ARGV);