diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:08:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:08:05 -0700 |
| commit | 037e9d5b1575d7ede05b50c317d9d88258556d84 (patch) | |
| tree | 03c3ee1400ea7eb09699e55c0e8ae109728a95cd /t/t6027-merge-binary.sh | |
| parent | attribute: whitespace set to true detects all errors known to git (diff) | |
| parent | upload-archive: fix infinite loop on Cygwin (diff) | |
| download | tgif-037e9d5b1575d7ede05b50c317d9d88258556d84.tar.xz | |
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
* pb/maint-1.6.2-userdiff-fix:
upload-archive: fix infinite loop on Cygwin
avoid exponential regex match for java and objc function names
Diffstat (limited to 't/t6027-merge-binary.sh')
0 files changed, 0 insertions, 0 deletions