diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:28:10 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:28:10 -0800 |
commit | 7ba46269a04de20032bd2dd614be6290cd65caab (patch) | |
tree | a307c572224dd1db28aabc7ce16cfae495e21c81 /t/t4108-apply-threeway.sh | |
parent | Prepare for 2.2.2 (diff) | |
parent | Merge branch 'maint-2.0' into maint-2.1 (diff) | |
download | tgif-7ba46269a04de20032bd2dd614be6290cd65caab.tar.xz |
Merge branch 'maint-2.1' into maint
* maint-2.1:
is_hfs_dotgit: loosen over-eager match of \u{..47}
Diffstat (limited to 't/t4108-apply-threeway.sh')
0 files changed, 0 insertions, 0 deletions