summaryrefslogtreecommitdiff
path: root/t/t9151/.gitignore
diff options
context:
space:
mode:
authorSam Vilain <sam.vilain@catalyst.net.nz>2009-10-20 02:42:02 (GMT)
committerEric Wong <normalperson@yhbt.net>2009-10-27 06:51:55 (GMT)
commitce62683096d144749c77e557ecd21c91b840b0f1 (patch)
treeb0367af91492041041cd0ed429786885e548ed05 /t/t9151/.gitignore
parentf1264bd65451a68e87e0f99c9601cfa1b3244db6 (diff)
downloadgit-ce62683096d144749c77e557ecd21c91b840b0f1.zip
git-ce62683096d144749c77e557ecd21c91b840b0f1.tar.gz
git-ce62683096d144749c77e557ecd21c91b840b0f1.tar.bz2
git-svn: add test data for SVN 1.5+ merge, with script.
Dump generated with SVN 1.5.1 (on lenny amd64). This test should hopefully cover all but a few intermediate versions of the svnmerge.py script. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9151/.gitignore')
-rw-r--r--t/t9151/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9151/.gitignore b/t/t9151/.gitignore
new file mode 100644
index 0000000..587c37d
--- /dev/null
+++ b/t/t9151/.gitignore
@@ -0,0 +1,2 @@
+foo
+foo.svn