Merge branch 'sb/unpack-trees-grammofix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:05 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:05 +0000 (15:19 -0800)
commit1addc197eb41a8fbcd6968c4ee245b65a68c2be6
treee4e6aa6f934db61bec3eebd12ce1b302954d1847
parent13236160c3ce46b84c4605a04a877ef7a407b539
parent584f99c87bf92d403a95527483f6e48d1722c3f0
Merge branch 'sb/unpack-trees-grammofix' into maint

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