Merge branch 'sb/unpack-trees-grammofix' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:17 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:18 +0000 (10:57 -0800)
commit29e536f590ff7d3dc064e5e2685a4c4e7a316fbd
tree28bb5e55738359cdf999a38be7b289388439b15a
parentd9996af5e88f5192a9ce2f3bbf3d959669bae5b0
parent584f99c87bf92d403a95527483f6e48d1722c3f0
Merge branch 'sb/unpack-trees-grammofix' into next

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