summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..9122eeb1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+BUILD_NUMBER merge=merge-keep-ours
+