From 684958144817a724b41db9637486b9ced853c020 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 16:01:30 -0800
Subject: Specify that we don't want the BUILD_NUMBER changes that happen in
 other branches by using a custom merge-keep-ours merge algorithm.

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

(limited to '.gitattributes')

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
+
-- 
cgit v1.2.3