Letting git merge hypothesis db files

drvinceknight · drvinceknight · commit feaa629427ef · 2015-12-15T16:13:09.000Z
Mainly following this https://hypothesis.readthedocs.org/en/latest/database.html#sharing-your-example-database
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.hypothesis/examples.db merge=hypothesisdb
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@ _build/
 dist/
 MANIFEST
 Axelrod.egg-info
-.hypothesis/
+.hypothesis/eval_source/
diff --git a/.hypothesis/examples.db b/.hypothesis/examples.db

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+.hypothesis/examples.db merge=hypothesisdb`