filemerge: put temporary files in single temp dir by default The feature introduced in D2888 seems like a pure improvement to me. It makes the names' of temporary file easier to read. Let's have it always enabled. I also removed the config option for the path prefix because it doesn't seem useful. I asked Kyle (the author of the feature) about it and he couldn't think of a reason to keep it. I suspect it was just that we to have a config to turn it on/off while it was experimental, so it might as well be a configurable prefix then. Differential Revision: https://phab.mercurial-scm.org/D12171

     1

Our full contribution guidelines are in our wiki, please see:

     2

     3

https://www.mercurial-scm.org/wiki/ContributingChanges

     4

     5

If you just want a checklist to follow, you can go straight to

     6

     7

https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist

     8

     9

If you can't run the entire testsuite for some reason (it can be

    10

difficult on Windows), please at least run `contrib/check-code.py` on

    11

any files you've modified and run `python contrib/check-commit` on any

    12

commits you've made (for example, `python contrib/check-commit

    13

273ce12ad8f1` will report some style violations on a very old commit).