Proper incremental diffing