resolve merge noise in favor of new upstream. note that this tosses out the
[debian/gzip] / gunzip.1
1 .so man1/gzip.1