summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:27:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-07 13:27:13 -0800
commit64a03e970ab3ef0ce45d6bd3c1de1bff1de2beee (patch)
tree90144b1837dddc0cf0b805d3e23dc10b51018030 /merge-recursive.c
parentGit 1.9.5 (diff)
parentMerge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 (diff)
downloadtgif-64a03e970ab3ef0ce45d6bd3c1de1bff1de2beee.tar.xz
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5: is_hfs_dotgit: loosen over-eager match of \u{..47}
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions