package.json: also configure git update-hash-mergetool

Installing will setup git hooks, so we can do one step further and
also configure the mergetool
2 jobs for 1.0
in 0 seconds, using 0 compute credits, and was queued for 0 seconds