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