notation: strip word "merge" from \setmergeof etc.; use new definition of \commitmerg...

[topbloke-formulae.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cafc31f1bbe41c20b0ff6cde4a5c5ba2d9135a8c..1d15410c799de74adb0041763e0f5faf988dfe82 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@
 *.dvi
 *.out
 *.pdf
+*.ps
 *~
+revid.inc
+*.new