Merge branch 'nd/dir-prep-exclude-cleanup'
commit1758d236a253c10f34ae16cd2ae6d9c57eb312a7
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 22:00:05 +0000 (24 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 22:00:05 +0000 (24 15:00 -0700)
tree1fda16f5c560740260fe4593641b1b38d9861294
parente4da4fbe0eea55c26f042f76df58bfc529b46ae0
parent03e11a715bffb0715ebcc9d6370aac7b968b3a4a
Merge branch 'nd/dir-prep-exclude-cleanup'

Code clean-up.

* nd/dir-prep-exclude-cleanup:
  dir.c: remove the second declaration of "stk" in prep_exclude()
dir.c