travis: detect merge diffs