![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700) | ||
| commit | 3c1ca015281e90541a7baf092448556ec6c588a0 | |
| tree | 605dbfa2b00bf4dc06787c5872a09d84b8cfb7e2 | tree | snapshot |
| parent | 4096958aab6f83302dd00f19d2bd500ae75e8c29 | commit | diff |
| parent | dff589ef949e97cbec5363b105ba27f6e85594fb | commit | diff |
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
* 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