Merge commit 'f9f6e2c' into nd/attr-match-optim-more
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Oct 2012 19:45:30 +0000 (12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Oct 2012 19:45:30 +0000 (12:45 -0700)
* commit 'f9f6e2c':
  exclude: do strcmp as much as possible before fnmatch
  dir.c: get rid of the wildcard symbol set in no_wildcard()
  Unindent excluded_from_list()

1  2 
dir.c
dir.h

diff --cc dir.c
Simple merge
diff --cc dir.h
Simple merge