diff --git a/.gitignore b/.gitignore
index 40caffa8e..21b5cfc05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ _$*
 *.ln
 core
 # CVS default ignores end
+.*.swp
diff --git a/DEVEL/.gitattributes b/DEVEL/.gitattributes
new file mode 100644
index 000000000..3e157372b
--- /dev/null
+++ b/DEVEL/.gitattributes
@@ -0,0 +1,4 @@
+Developer.txt filter=NHtext merge=NHsubst
+nhgitset.pl filter=NHtext merge=NHsubst
+hookdir/* filter=NHtext merge=NHsubst
+* text=auto
diff --git a/DEVEL/.gitattributes.swp b/DEVEL/.gitattributes.swp
deleted file mode 100644
index 1d91c53a5..000000000
Binary files a/DEVEL/.gitattributes.swp and /dev/null differ