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
......@@ -13,6 +13,6 @@
"lint-staged": "^12.1.2"
},
"scripts": {
"prepare": "husky install"
"prepare": "husky install && git config merge.tool update-hash-mergetool && git config mergetool.update-hash-mergetool.cmd './update-hash-mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"' && git config mergetool.update-hash-mergetool.trustExitCode true"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment