chiark / gitweb /
Prove that plain git merges on non-tb branches are ok
-rw-r--r-- 38 .gitignore
-rw-r--r-- 194 Makefile
-rw-r--r-- 20939 article.tex
-rw-r--r-- 205 test.tex