| commit | 2cd900fcf577af2cc5094ba21d1699809649f3bc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 21:50:11 +0000 (28 13:50 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 21:50:11 +0000 (28 13:50 -0800) | ||
| tree | eec92d5e096ee2a2a5ee2352e1c276382552505b | treesnapshot (tar.gz zip) |
| parent | d2559f734bba7fe5257720356a92f3b7a5b0d37c | commitdiff |
| parent | 17367939ebd64f5e6eb4fa5a32ece513f497e6e6 | commitdiff |
Merge branch 'maint'
* maint:
Prepare for 1.7.3.5
Fix false positives in t3404 due to SHELL=/bin/false
close file on error in read_mmfile()
Conflicts:
RelNotes
* maint:
Prepare for 1.7.3.5
Fix false positives in t3404 due to SHELL=/bin/false
close file on error in read_mmfile()
Conflicts:
RelNotes
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |