aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1fab0e0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+paper.tex merge=ours
+tex/src/*.tex merge=ours
+reproduce/analysis/config/*.conf merge=ours
+reproduce/software/config/TARGETS.conf merge=ours
+reproduce/software/config/texlive-packages.conf merge=ours \ No newline at end of file