diff preserve flag handling