Don't keep merge backups
Hardcore Mode for OS X - still need to configure