[Bug 650476] osc diff produces incorrect patches