Merge branch 'maint-2.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 21:28:10 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 21:28:10 +0000 (13:28 -0800)
* maint-2.1:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

1  2 
t/t1450-fsck.sh
utf8.c

diff --cc t/t1450-fsck.sh
Simple merge
diff --cc utf8.c
Simple merge