.gitignore and repository/.gitattributes

dalehenrich · dalehenrich · commit 132f4ca11259 · 2014-06-29T08:41:12.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
diff --git a/repository/.gitattributes b/repository/.gitattributes
@@ -0,0 +1,3 @@
+*.package/monticello.meta/version        merge=mcVersion
+*.package/*.class/methodProperties.json      merge=mcMethodProperties
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*.package/monticello.meta/version merge=mcVersion`
	`2`	`+.package/.class/methodProperties.json merge=mcMethodProperties`
	`3`	`+`