Set default mergetool to splice (non-GUI).
Merge branch 'master' into mac