+<<<<<<< HEAD
+=======
2012-03-24 Bruno Haible <bruno@clisp.org>
gnulib-tool: Avoid unintended error output from 'cmp'.
(main): Skip the test if sethostname() fails with EPERM. On Windows
platforms, don't check the result of gethostname().
+>>>>>>> snapshot-start
2011-12-04 Bruno Haible <bruno@clisp.org>
Jim Meyering <meyering@redhat.com>
tests: Avoid spurious error message on platforms without mktemp program.
* tests/init.sh (mktempd_): Run mktemp in a subcommand.
+<<<<<<< HEAD
+=======
2011-12-04 Bruno Haible <bruno@clisp.org>
sethostname: Fix documentation.
* m4/gethostname.m4 (gl_PREREQ_HOST_NAME_MAX): Make this a separate
macro so it can be used by the pending sethostname module.
+>>>>>>> snapshot-start
2011-12-03 Bruno Haible <bruno@clisp.org>
Fix module descriptions syntax.