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)
* sb/unpack-trees-grammofix:
  unpack-trees: fix grammar for untracked files in directories

1  2 
t/t7609-merge-co-error-msgs.sh
unpack-trees.c

Simple merge
diff --cc unpack-trees.c
Simple merge