]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'maint-1.8.5' into maint-1.9
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 21:27:13 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jan 2015 21:27:13 +0000 (13:27 -0800)
* maint-1.8.5:
  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