diff support - merge to unstable