From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Oct 2009 23:07:41 +0000 (-0700)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.6.6-rc0~95
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3c1ca015281e90541a7baf092448556ec6c588a0;p=git.git

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
  git-svn: add test data for SVN 1.5+ merge, with script.
  git-svn: convert SVK merge tickets to extra parents
  git-svn: allow test setup script to support PERL env. var
  git-svn: add test data for SVK merge, with script.
  git svn: fix fetch where glob is on the top-level URL
---

3c1ca015281e90541a7baf092448556ec6c588a0