Initialize diff options properly