make sure diff resolves against parent