diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:27:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:27:19 -0800 |
commit | 282616c72d1d08a77ca4fe1186cb708c38408d87 (patch) | |
tree | 2e8e4242f7c7891adbad096ac9d47350358b0ef1 /mergetools/xxdiff | |
parent | Git 2.0.5 (diff) | |
parent | Merge branch 'maint-1.8.5' into maint-1.9 (diff) | |
download | tgif-282616c72d1d08a77ca4fe1186cb708c38408d87.tar.xz |
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 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions