Diff & Merge Diff Types¶ Diff ¶ Base class for all diff types Inserted ¶ Bases: Diff value instance-attribute ¶ value: Any Deleted ¶ Bases: Diff value instance-attribute ¶ value: Any Changed ¶ Bases: Diff new instance-attribute ¶ new: Any old instance-attribute ¶ old: Any NestedDiff ¶ Bases: Diff children instance-attribute ¶ children: dict[str, Diff] | dict[int, Diff] __getitem__ ¶ __getitem__(item: Any) -> Diff Conflict Types¶ Conflict ¶ Base class for all conflict types Basic ¶ Bases: Conflict change1 instance-attribute ¶ change1: Diff change2 instance-attribute ¶ change2: Diff old instance-attribute ¶ old: Any NestedConflict ¶ Bases: Conflict children instance-attribute ¶ children: dict[str, Conflict] | dict[int, Conflict] __getitem__ ¶ __getitem__(item: Any) -> Diff