Found the answer after some digging
EDIT: As per Mark’s suggestion, this is the best way to do so:
git config --global core.mergeoptions --no-edit
Found the answer after some digging
EDIT: As per Mark’s suggestion, this is the best way to do so:
git config --global core.mergeoptions --no-edit