Merge branch 'js/mine'
Add textobj-diff to the configuration.