Much better diff support now