projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37ee62b 5b5d53c)
Merge branch 'rj/test-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 19:35:28 +0000 (11:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 19:35:28 +0000 (11:35 -0800)
commit7810c6b6d6cf91d624216623e2327d7cb63c1c92
tree373142243f3fedca26f5bcf566692eb3f0745587tree | snapshot
parent37ee62bc6b60b566e39c8ea9fbf34b23a9a39d2fcommit | diff
parent5b5d53cbe5d67bd86543a4851014fde0837d1344commit | diff
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
t/t3032-merge-recursive-options.sh diff1 | diff2 | blob | history
t/test-lib.sh diff1 | diff2 | blob | history
Git—the stupid content tracker