| commit | 7810c6b6d6cf91d624216623e2327d7cb63c1c92 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jan 2011 19:35:28 +0000 (13 11:35 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jan 2011 19:35:28 +0000 (13 11:35 -0800) | ||
| tree | 373142243f3fedca26f5bcf566692eb3f0745587 | treesnapshot (tar.gz zip) |
| parent | 37ee62bc6b60b566e39c8ea9fbf34b23a9a39d2f | commitdiff |
| parent | 5b5d53cbe5d67bd86543a4851014fde0837d1344 | commitdiff |
Merge branch 'rj/test-fixes'
* rj/test-fixes:
t4135-*.sh: Skip the "backslash" tests on cygwin
t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
Conflicts:
t/t3032-merge-recursive-options.sh
* rj/test-fixes:
t4135-*.sh: Skip the "backslash" tests on cygwin
t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
Conflicts:
t/t3032-merge-recursive-options.sh
| t/t3032-merge-recursive-options.sh | diff1 | diff2 | blobhistory |
| t/test-lib.sh | diff1 | diff2 | blobhistory |