change diff/merge settings to be global