Conflicts: doc/Makefile.in doc/getdate.texi doc/stamp-vti doc/tar.info doc/tar.info-1 doc/tar.info-2 doc/tar.texi doc/version.texi