$sel:adds:Unconflicts | Unison.Merge.Unconflicts, Unison.Merge |
$sel:alice:ThreeWay | Unison.Merge.ThreeWay, Unison.Merge |
$sel:alice:TwoOrThreeWay | Unison.Merge.TwoOrThreeWay, Unison.Merge |
$sel:alice:TwoWay | Unison.Merge.TwoWay, Unison.Merge |
$sel:alice:TwoWayI | Unison.Merge.TwoWayI, Unison.Merge |
$sel:bob:ThreeWay | Unison.Merge.ThreeWay, Unison.Merge |
$sel:bob:TwoOrThreeWay | Unison.Merge.TwoOrThreeWay, Unison.Merge |
$sel:bob:TwoWay | Unison.Merge.TwoWay, Unison.Merge |
$sel:bob:TwoWayI | Unison.Merge.TwoWayI, Unison.Merge |
$sel:both:TwoWayI | Unison.Merge.TwoWayI, Unison.Merge |
$sel:conflicts:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:conflicts:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:constructorAliases:IncoherentDeclReasons | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
$sel:constructorToDecl:PartialDeclNameLookup | Unison.Merge.PartialDeclNameLookup, Unison.Merge |
$sel:coreDependencies:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:declNameLookups:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:declNameLookups:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:declToConstructors:PartialDeclNameLookup | Unison.Merge.PartialDeclNameLookup, Unison.Merge |
$sel:defns:Mergeblob0 | Unison.Merge.Mergeblob0, Unison.Merge |
$sel:defns:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:defns:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:deletes:Unconflicts | Unison.Merge.Unconflicts, Unison.Merge |
$sel:dependencies:Mergeblob4 | Unison.Merge.Mergeblob4, Unison.Merge |
$sel:diff:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:diffs:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:file:Mergeblob4 | Unison.Merge.Mergeblob4, Unison.Merge |
$sel:file:Mergeblob5 | Unison.Merge.Mergeblob5, Unison.Merge |
$sel:hasConflicts:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:hash:Synhashed | Unison.Merge.Synhashed, Unison.Merge |
$sel:hydratedDefns:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:hydratedDefns:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:lca:ThreeWay | Unison.Merge.ThreeWay, Unison.Merge |
$sel:lca:TwoOrThreeWay | Unison.Merge.TwoOrThreeWay, Unison.Merge |
$sel:lcaDeclNameLookup:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:lcaDeclNameLookup:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:lcaLibdeps:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:lcaLibdeps:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:libdeps:Mergeblob0 | Unison.Merge.Mergeblob0, Unison.Merge |
$sel:libdeps:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:libdeps:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:libdeps:Mergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
$sel:libdepsDiff:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:missingConstructorNames:IncoherentDeclReasons | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
$sel:nametrees:Mergeblob0 | Unison.Merge.Mergeblob0, Unison.Merge |
$sel:nestedDeclAliases:IncoherentDeclReasons | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
$sel:new:Updated | Unison.Merge.Updated, Unison.Merge |
$sel:old:Updated | Unison.Merge.Updated, Unison.Merge |
$sel:soloUpdatesAndDeletes:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:stageOne:Mergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
$sel:stageTwo:Mergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
$sel:strayConstructors:IncoherentDeclReasons | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
$sel:unconflicts:Mergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
$sel:unconflicts:Mergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
$sel:uniqueTypeGuids:Mergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
$sel:unparsedFile:Mergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
$sel:unparsedSoloFiles:Mergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
$sel:updates:Unconflicts | Unison.Merge.Unconflicts, Unison.Merge |
$sel:value:Synhashed | Unison.Merge.Synhashed, Unison.Merge |
AddBothLibdeps | Unison.Merge.Libdeps, Unison.Merge |
AddLibdep | Unison.Merge.Libdeps, Unison.Merge |
Alice | Unison.Merge.EitherWay, Unison.Merge |
AliceAndBob | Unison.Merge.EitherWayI, Unison.Merge |
apply | Unison.Merge.Unconflicts |
applyLibdepsDiff | Unison.Merge.Libdeps |
Bob | Unison.Merge.EitherWay, Unison.Merge |
bothWays | Unison.Merge.TwoWay |
checkAllDeclCoherency | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
checkDeclCoherency | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
CombinedDiffOp | Unison.Merge.CombineDiffs, Unison.Merge |
CombinedDiffOp'Add | Unison.Merge.CombineDiffs, Unison.Merge |
CombinedDiffOp'Conflict | Unison.Merge.CombineDiffs, Unison.Merge |
CombinedDiffOp'Delete | Unison.Merge.CombineDiffs, Unison.Merge |
CombinedDiffOp'Update | Unison.Merge.CombineDiffs, Unison.Merge |
combineDiffs | Unison.Merge.CombineDiffs |
DeleteLibdep | Unison.Merge.Libdeps, Unison.Merge |
diffLibdeps | Unison.Merge.Libdeps |
DiffOp | Unison.Merge.DiffOp, Unison.Merge |
DiffOp'Add | Unison.Merge.DiffOp, Unison.Merge |
DiffOp'Delete | Unison.Merge.DiffOp, Unison.Merge |
DiffOp'Update | Unison.Merge.DiffOp, Unison.Merge |
EitherWay | Unison.Merge.EitherWay, Unison.Merge |
EitherWayI | Unison.Merge.EitherWayI, Unison.Merge |
empty | Unison.Merge.Unconflicts |
excludingAlice | Unison.Merge.EitherWayI |
findConflictedAlias | Unison.Merge.FindConflictedAlias |
forgetBoth | Unison.Merge.TwoWayI |
forgetLca | Unison.Merge.ThreeWay |
getTwoFreshLibdepNames | Unison.Merge.Libdeps |
hashBuiltinTermTokens | Unison.Merge.Synhash |
hashDerivedTermTokens | Unison.Merge.Synhash |
includingAlice | Unison.Merge.EitherWayI |
IncoherentDeclReason | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
IncoherentDeclReason'ConstructorAlias | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
IncoherentDeclReason'MissingConstructorName | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
IncoherentDeclReason'NestedDeclAlias | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
IncoherentDeclReason'StrayConstructor | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
IncoherentDeclReasons | |
1 (Type/Class) | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
2 (Data Constructor) | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
justTheTerms | Unison.Merge.TwoWay |
justTheTypes | Unison.Merge.TwoWay |
lenientCheckDeclCoherency | Unison.Merge.DeclCoherencyCheck, Unison.Merge |
LibdepDiffOp | Unison.Merge.Libdeps, Unison.Merge |
make | Unison.Merge.TwoDiffOps |
makeMergeblob0 | Unison.Merge.Mergeblob0, Unison.Merge |
makeMergeblob1 | Unison.Merge.Mergeblob1, Unison.Merge |
makeMergeblob2 | Unison.Merge.Mergeblob2, Unison.Merge |
makeMergeblob3 | Unison.Merge.Mergeblob3, Unison.Merge |
makeMergeblob4 | Unison.Merge.Mergeblob4, Unison.Merge |
makeMergeblob5 | Unison.Merge.Mergeblob5, Unison.Merge |
Mergeblob0 | |
1 (Type/Class) | Unison.Merge.Mergeblob0, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob0, Unison.Merge |
Mergeblob1 | |
1 (Type/Class) | Unison.Merge.Mergeblob1, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob1, Unison.Merge |
Mergeblob2 | |
1 (Type/Class) | Unison.Merge.Mergeblob2, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob2, Unison.Merge |
Mergeblob2Error | Unison.Merge.Mergeblob2, Unison.Merge |
Mergeblob2Error'ConflictedAlias | Unison.Merge.Mergeblob2, Unison.Merge |
Mergeblob2Error'ConflictedBuiltin | Unison.Merge.Mergeblob2, Unison.Merge |
Mergeblob3 | |
1 (Type/Class) | Unison.Merge.Mergeblob3, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob3, Unison.Merge |
Mergeblob4 | |
1 (Type/Class) | Unison.Merge.Mergeblob4, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob4, Unison.Merge |
Mergeblob5 | |
1 (Type/Class) | Unison.Merge.Mergeblob5, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob5, Unison.Merge |
nameBasedNamespaceDiff | Unison.Merge.Diff |
narrowConflictsToNonBuiltins | Unison.Merge.PartitionCombinedDiffs |
OnlyAlice | Unison.Merge.EitherWayI, Unison.Merge |
OnlyBob | Unison.Merge.EitherWayI, Unison.Merge |
or | Unison.Merge.TwoWay |
PartialDeclNameLookup | |
1 (Type/Class) | Unison.Merge.PartialDeclNameLookup, Unison.Merge |
2 (Data Constructor) | Unison.Merge.PartialDeclNameLookup, Unison.Merge |
partitionCombinedDiffs | Unison.Merge.PartitionCombinedDiffs |
sequenceDefns | Unison.Merge.TwoWay |
soloUpdatesAndDeletes | Unison.Merge.Unconflicts |
swap | |
1 (Function) | Unison.Merge.EitherWay |
2 (Function) | Unison.Merge.TwoWay |
synhashBuiltinDecl | Unison.Merge.Synhash |
synhashBuiltinTerm | Unison.Merge.Synhash |
synhashDerivedDecl | Unison.Merge.Synhash |
synhashDerivedTerm | Unison.Merge.Synhash |
Synhashed | |
1 (Type/Class) | Unison.Merge.Synhashed, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Synhashed, Unison.Merge |
synhashTerm | Unison.Merge.Synhash |
synhashType | Unison.Merge.Synhash |
ThreeWay | |
1 (Type/Class) | Unison.Merge.ThreeWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.ThreeWay, Unison.Merge |
TwoDiffOps | Unison.Merge.TwoDiffOps |
TwoDiffOps'Add | Unison.Merge.TwoDiffOps |
TwoDiffOps'AddAdd | Unison.Merge.TwoDiffOps |
TwoDiffOps'Delete | Unison.Merge.TwoDiffOps |
TwoDiffOps'DeleteDelete | Unison.Merge.TwoDiffOps |
TwoDiffOps'DeleteUpdate | Unison.Merge.TwoDiffOps |
TwoDiffOps'Update | Unison.Merge.TwoDiffOps |
TwoDiffOps'UpdateDelete | Unison.Merge.TwoDiffOps |
TwoDiffOps'UpdateUpdate | Unison.Merge.TwoDiffOps |
TwoOrThreeWay | |
1 (Type/Class) | Unison.Merge.TwoOrThreeWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.TwoOrThreeWay, Unison.Merge |
TwoWay | |
1 (Type/Class) | Unison.Merge.TwoWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.TwoWay, Unison.Merge |
twoWay | Unison.Merge.TwoWay |
TwoWayI | |
1 (Type/Class) | Unison.Merge.TwoWayI, Unison.Merge |
2 (Data Constructor) | Unison.Merge.TwoWayI, Unison.Merge |
Unconflicts | |
1 (Type/Class) | Unison.Merge.Unconflicts, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Unconflicts, Unison.Merge |
unzipMap | Unison.Merge.TwoWay |
Updated | |
1 (Type/Class) | Unison.Merge.Updated, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Updated, Unison.Merge |
value | |
1 (Function) | Unison.Merge.EitherWay |
2 (Function) | Unison.Merge.EitherWayI |
who_ | |
1 (Function) | Unison.Merge.TwoWay |
2 (Function) | Unison.Merge.TwoWayI |