Merge branch 'mg/texinfo-5' into maint

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index d62aebd848b2a44f977ad4d7c4b75b6ff72b2163..2c8b2d612ee0d6c1f687bfa062bb7fe6471d9280 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -9,4 +9,5 @@ gitman.info
 howto-index.txt
 doc.dep
 cmds-*.txt
+mergetools-*.txt
 manpage-base-url.xsl