Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:43:40 +0000 (08:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:43:40 +0000 (08:43 -0700)
* jk/checkout-attribute-lookup:
  t2003: work around path mangling issue on Windows
  entry: fix filter lookup
  t2003: modernize style

1  2 
entry.c

diff --cc entry.c
Simple merge