Make test broken w/ 180b0d7483711120e28289ff7d9fa346eddd5cb7

*** t1200-tutorial.sh ***
*   ok 1: blob
*   ok 2: blob 557db03
*   ok 3: git-diff-files -p
*   ok 4: git diff
*   ok 5: tree
*   ok 6: commit
*   ok 7: git-diff-index -p HEAD
*   ok 8: git diff HEAD
*   ok 9: git-whatchanged -p --root
*   ok 10: git tag my-first-tag
*   ok 11: git checkout -b mybranch
*   ok 12: git branch
*   ok 13: git resolve now fails
*   ok 14: git show-branch
* FAIL 15: git resolve
         cmp resolve.expect resolve.output
*   ok 16: git show-branch
*   ok 17: git repack
*   ok 18: git prune-packed
*   ok 19: -> only packed objects
* failed 1 among 19 test(s)