![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Jan 2011 07:49:15 +0000 (23:49 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Jan 2011 07:49:15 +0000 (23:49 -0800) | ||
| commit | 37ef4565b370f6fb2656650e0a93ca99242322d6 | |
| tree | 9f0586e2f6a3f97feac1f3548afd8f23596929f5 | tree | snapshot |
| parent | 0ee1fd1aafee90d0d39349401d95ef0462c34fdc | commit | diff |
| parent | 5b5d53cbe5d67bd86543a4851014fde0837d1344 | commit | diff |
Merge branch 'rj/test-fixes' into next
* 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 | | blob | history |
| t/test-lib.sh | diff1 | | diff2 | | blob | history |