chiark / gitweb /
Rename \merge to \mergeof so we can have \merge
-rw-r--r-- 38 .gitignore
-rw-r--r-- 194 Makefile
-rw-r--r-- 13895 article.tex
-rw-r--r-- 205 test.tex