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)
commit7810c6b...d6cf91d624216623e2327d7cb63c1c92
tree3731422...3f3fedca26f5bcf566692eb3f0745587copy hash to clipboard (tree)
parent37ee62b...6b60b566e39c8ea9fbf34b23a9a39d2fcopy hash to clipboard (diff)
parent5b5d53c...e5d67bd86543a4851014fde0837d1344copy hash to clipboard (diff)
t/t3032-merge-recursive-options.sh
t/test-lib.sh