diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 22:27:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 22:27:19 +0100 |
| commit | 282616c72d1d08a77ca4fe1186cb708c38408d87 (patch) | |
| tree | 2e8e4242f7c7891adbad096ac9d47350358b0ef1 /merge-recursive.h | |
| parent | Git 2.0.5 (diff) | |
| parent | Merge branch 'maint-1.8.5' into maint-1.9 (diff) | |
| download | git-282616c72d1d08a77ca4fe1186cb708c38408d87.tar.xz git-282616c72d1d08a77ca4fe1186cb708c38408d87.zip | |
Merge branch 'maint-1.9' into maint-2.0
* maint-1.9:
is_hfs_dotgit: loosen over-eager match of \u{..47}
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions