[Bug 225696] Merge Review: diffutils