some new diff options for vim