summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorKWIML Upstream <kwrobot@kitware.com>2015-12-09 18:31:42 (GMT)
committerBrad King <brad.king@kitware.com>2015-12-17 19:56:38 (GMT)
commit3fdbb0a806f67f10ea8428e03a4523d08d2b083c (patch)
treedae6fddbe2cfa20bdd48e3d012bb92a1330f367d /.gitattributes
downloadCMake-3fdbb0a806f67f10ea8428e03a4523d08d2b083c.zip
CMake-3fdbb0a806f67f10ea8428e03a4523d08d2b083c.tar.gz
CMake-3fdbb0a806f67f10ea8428e03a4523d08d2b083c.tar.bz2
KWIML 2015-12-09 (43f9f8d0)
Code extracted from: https://github.com/Kitware/KWIML.git at commit 43f9f8d0b0c8ee62aa056a2020981a6d98a40dd4 (master).
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..ecbf219
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.md conflict-marker-size=78