Use consistent directory for temporary files

These are the temporary files:
* git merge metadata: `MERGE_HEAD`, `MERGE_MODE`, `MERGE_MSG`
* patch file
* debug log

Ideally they would all be stored in `/tmp/` so that they would eventually deleted by the OS.  However, this could result in data loss in certain failure conditions, so everything should probably be stored in `.git/`.