Ops produced by theirs/edited choices, in conflict order.
theirs
edited
Resolution records for the merge manifest (includes ours picks).
ours
Conflicts no resolution addressed.
Ops produced by
theirs/editedchoices, in conflict order.