use unified diff format (diff -Naur), which is much more robust and generally preferred -- previous patch failed to apply even in simple situations
hg template diff: renamed to reflect the base version (which silently changed in caf19101073d, by accident?) --HG-- rename : Admin/Mercurial/isabelle-style.diff => Admin/Mercurial/isabelle-style-1.3.1.diff