3 ms·How so? Its documentation on merge conflicts just reiterates setting `diff3`.by aendruk 5y agoHow so? Its documentation on merge conflicts just reiterates setting `diff3`.