diff --git a/lib/haml/.gitattributes b/lib/haml/.gitattributes
new file mode 100644
index 00000000..4c5b7607
--- /dev/null
+++ b/lib/haml/.gitattributes
@@ -0,0 +1 @@
+version.rb merge=ours