Merge branch 'sb/unpack-trees-grammofix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:31 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:31 +0000 (14:45 -0800)
commit0f30315ba15f792fac6f901ca486900a74fdb86d
tree53a091b55013af699480c662531c847df5eb52a5
parentb08c812f99e8260c7f93966b0ee2b1339120ce29
parent584f99c87bf92d403a95527483f6e48d1722c3f0
Merge branch 'sb/unpack-trees-grammofix'

* sb/unpack-trees-grammofix:
  unpack-trees: fix grammar for untracked files in directories
t/t7609-merge-co-error-msgs.sh
unpack-trees.c