[Bug 732918] Diff and link to parent gone when conflict is present