diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-10-27 16:07:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-27 16:07:41 -0700 |
| commit | 3c1ca015281e90541a7baf092448556ec6c588a0 (patch) | |
| tree | 605dbfa2b00bf4dc06787c5872a09d84b8cfb7e2 /t/t9151/.gitignore | |
| parent | Merge git://repo.or.cz/git-gui (diff) | |
| parent | git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents (diff) | |
| download | tgif-3c1ca015281e90541a7baf092448556ec6c588a0.tar.xz | |
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
Diffstat (limited to 't/t9151/.gitignore')
| -rw-r--r-- | t/t9151/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9151/.gitignore b/t/t9151/.gitignore new file mode 100644 index 0000000000..587c37dba3 --- /dev/null +++ b/t/t9151/.gitignore @@ -0,0 +1,2 @@ +foo +foo.svn |