hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
include hg
recursive-include mercurial *.py
include hgweb.cgi hgwebdir.cgi
include hgeditor rewrite-log
include tests/README tests/run-tests tests/test-*[a-z0-9] tests/*.out
prune tests/*.err
include *.txt
include templates/map templates/map-*[a-z0-9]
include templates/*.tmpl
include doc/README doc/Makefile doc/*.txt doc/*.html doc/*.[0-9]
recursive-include contrib *
include README
include CONTRIBUTORS
include COPYING
include Makefile
include MANIFEST.in