Show diffs on Travis CI
Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS