summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-01-17 17:33:10 -0800
committerBharat Mediratta <bharat@menalto.com>2011-01-17 17:34:19 -0800
commit76411d7d6d481bc2ab51e24ec2dbf003f43ce40b (patch)
tree3544be831c7d6cb52f4ea685493fcdeb9ec378a9 /.gitattributes
parent29be21bb0deaf70558b1aa02a115e67daefea0bd (diff)
Rename BUILD_NUMBER to .build_number so it's not so loud.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 9122eeb1..fdf9d072 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-BUILD_NUMBER merge=merge-keep-ours
+.build_number merge=merge-keep-ours