Merge branch 'mg/texinfo-5' into maint

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 1c3a9fead579a9b52037f1bbe245998db8a2f40b..2c8b2d612ee0d6c1f687bfa062bb7fe6471d9280 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -3,9 +3,11 @@
 *.[1-8]
 *.made
 *.texi
+*.pdf
 git.info
 gitman.info
 howto-index.txt
 doc.dep
 cmds-*.txt
+mergetools-*.txt
 manpage-base-url.xsl