Commit a52c4aad authored by Jérome Perrin's avatar Jérome Perrin

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
parent 2a2cf53e
Pipeline #18866 failed with stage