$sel:adds:Rename | Unison.Merge.Rename, Unison.Merge |
$sel:adds:Unconflicts | Unison.Merge.Unconflicts, Unison.Merge |
$sel:alice:GThreeWay | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
$sel:alice:ThreeWay | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
$sel:alice:TwoOrThreeWay | Unison.Merge.Internal.Types, Unison.Merge.TwoOrThreeWay, Unison.Merge |
$sel:alice:TwoWay | Unison.Merge.Internal.Types, Unison.Merge.TwoWay, Unison.Merge |
$sel:alice:TwoWayI | Unison.Merge.TwoWayI, Unison.Merge |
$sel:backwards:SimpleRenames | Unison.Merge.Rename, Unison.Merge |
$sel:bob:GThreeWay | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
$sel:bob:ThreeWay | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
$sel:bob:TwoOrThreeWay | Unison.Merge.Internal.Types, Unison.Merge.TwoOrThreeWay, Unison.Merge |
$sel:bob:TwoWay | Unison.Merge.Internal.Types, Unison.Merge.TwoWay, Unison.Merge |
$sel:bob:TwoWayI | Unison.Merge.TwoWayI, Unison.Merge |
$sel:both:TwoWayI | Unison.Merge.TwoWayI, Unison.Merge |
$sel:conflicts:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:conflicts:Mergeblob | Unison.Merge.Mergeblob, Unison.Merge |
$sel:declNameLookups:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:defns:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:defnsIds:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:deletes:Rename | Unison.Merge.Rename, Unison.Merge |
$sel:deletes:Unconflicts | Unison.Merge.Unconflicts, Unison.Merge |
$sel:diff:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:diffsFromLCA:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:forwards:SimpleRenames | Unison.Merge.Rename, Unison.Merge |
$sel:hash:Synhashed | Unison.Merge.Synhashed, Unison.Merge |
$sel:hydratedNarrowedDefns:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:lca:GThreeWay | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
$sel:lca:ThreeWay | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
$sel:lca:TwoOrThreeWay | Unison.Merge.Internal.Types, Unison.Merge.TwoOrThreeWay, Unison.Merge |
$sel:libdeps:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:libdepsDiffs:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:logDefns:DiffblobLog | Unison.Merge.Diffblob, Unison.Merge |
$sel:logDiff:DiffblobLog | Unison.Merge.Diffblob, Unison.Merge |
$sel:logDiffsFromLCA:DiffblobLog | Unison.Merge.Diffblob, Unison.Merge |
$sel:logNarrowedDefns:DiffblobLog | Unison.Merge.Diffblob, Unison.Merge |
$sel:logSynhashedNarrowedDefns:DiffblobLog | Unison.Merge.Diffblob, Unison.Merge |
$sel:new:Updated | Unison.Merge.Updated, Unison.Merge |
$sel:old:Updated | Unison.Merge.Updated, Unison.Merge |
$sel:propagatedUpdates:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:simpleRenames:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:typecheckedFile:Mergeblob | Unison.Merge.Mergeblob, Unison.Merge |
$sel:unchanged:Rename | Unison.Merge.Rename, Unison.Merge |
$sel:unconflictedDefns:Mergeblob | Unison.Merge.Mergeblob, Unison.Merge |
$sel:unconflicts:Diffblob | Unison.Merge.Diffblob, Unison.Merge |
$sel:uniqueTypeGuids:Mergeblob | Unison.Merge.Mergeblob, Unison.Merge |
$sel:unparsedFile:Mergeblob | Unison.Merge.Mergeblob, Unison.Merge |
$sel:unparsedSoloFiles:Mergeblob | Unison.Merge.Mergeblob, 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 |
bimap | Unison.Merge.Updated |
bitraverse | Unison.Merge.Updated |
Bob | Unison.Merge.EitherWay, Unison.Merge |
bothUpdatedNames | Unison.Merge.Unconflicts |
bothWays | Unison.Merge.TwoWay |
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 |
Diffblob | |
1 (Type/Class) | Unison.Merge.Diffblob, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Diffblob, Unison.Merge |
DiffblobLog | |
1 (Type/Class) | Unison.Merge.Diffblob, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Diffblob, 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 |
DiffOp2 | Unison.Merge.DiffOp |
DiffOp2'Add | Unison.Merge.DiffOp |
DiffOp2'Delete | Unison.Merge.DiffOp |
DiffOp2'Update | Unison.Merge.DiffOp |
diffSynhashedDefns | Unison.Merge.Diff |
EitherWay | Unison.Merge.EitherWay, Unison.Merge |
EitherWayI | Unison.Merge.EitherWayI, Unison.Merge |
empty | Unison.Merge.Unconflicts |
excludingAlice | Unison.Merge.EitherWayI |
findConflictedAlias | Unison.Merge.FindConflictedAlias |
foldMap | Unison.Merge.Updated |
forgetBoth | Unison.Merge.TwoWayI |
forgetLca | |
1 (Function) | Unison.Merge.TwoOrThreeWay |
2 (Function) | Unison.Merge.ThreeWay |
fromPair | Unison.Merge.Updated |
getTwoFreshLibdepNames | Unison.Merge.Libdeps |
gforgetLca | Unison.Merge.ThreeWay |
gfromTwoWay | Unison.Merge.ThreeWay |
GThreeWay | |
1 (Type/Class) | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
gtoThreeWay | Unison.Merge.TwoWay |
gtoUpdated | Unison.Merge.ThreeWay |
GUpdated | Unison.Merge.Updated, Unison.Merge |
hashBuiltinTermTokens | Unison.Merge.Synhash |
hashDerivedTermTokens | Unison.Merge.Synhash |
includingAlice | Unison.Merge.EitherWayI |
justTheTerms | Unison.Merge.TwoWay |
justTheTypes | Unison.Merge.TwoWay |
LibdepDiffOp | Unison.Merge.Libdeps, Unison.Merge |
make | Unison.Merge.TwoDiffOps |
makeDiffblob | Unison.Merge.Diffblob, Unison.Merge |
makeMergeblob | Unison.Merge.Mergeblob, Unison.Merge |
makeRenames | Unison.Merge.Rename |
makeSimpleRenames | Unison.Merge.Rename |
map | |
1 (Function) | Unison.Merge.Updated |
2 (Function) | Unison.Merge.DiffOp |
Mergeblob | |
1 (Type/Class) | Unison.Merge.Mergeblob, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Mergeblob, Unison.Merge |
MergeblobError | Unison.Merge.Mergeblob, Unison.Merge |
MergeblobError'ConflictedAlias | Unison.Merge.Mergeblob, Unison.Merge |
MergeblobError'ConflictedBuiltin | Unison.Merge.Mergeblob, Unison.Merge |
mergeLibdepsDiffs | Unison.Merge.Libdeps |
narrowConflictsToNonBuiltins | Unison.Merge.PartitionCombinedDiffs |
narrowDefns | Unison.Merge.Narrow |
OnlyAlice | Unison.Merge.EitherWayI, Unison.Merge |
OnlyBob | Unison.Merge.EitherWayI, Unison.Merge |
or | Unison.Merge.TwoWay |
partitionCombinedDiffs | Unison.Merge.PartitionCombinedDiffs |
Rename | |
1 (Type/Class) | Unison.Merge.Rename, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Rename, Unison.Merge |
renderUnisonFiles | Unison.Merge.Render |
sequenceDefns | |
1 (Function) | Unison.Merge.Updated |
2 (Function) | Unison.Merge.TwoWay |
SimpleRenames | |
1 (Type/Class) | Unison.Merge.Rename, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Rename, Unison.Merge |
soloDeletedNames | Unison.Merge.Unconflicts |
soloUpdatedNames | Unison.Merge.Unconflicts |
swap | |
1 (Function) | Unison.Merge.EitherWay |
2 (Function) | Unison.Merge.TwoWay |
synhashDefns | Unison.Merge.Synhash |
Synhashed | |
1 (Type/Class) | Unison.Merge.Synhashed, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Synhashed, Unison.Merge |
synhashLcaDefns | Unison.Merge.Synhash |
ThreeWay | |
1 (Type/Class) | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Internal.Types, Unison.Merge.ThreeWay, Unison.Merge |
toPair | Unison.Merge.Updated |
toThreeWay | |
1 (Function) | Unison.Merge.TwoOrThreeWay |
2 (Function) | Unison.Merge.TwoWay |
toTwoOrThreeWay | Unison.Merge.ThreeWay |
toUpdated | Unison.Merge.ThreeWay |
traverse | |
1 (Function) | Unison.Merge.Updated |
2 (Function) | Unison.Merge.DiffOp |
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.Internal.Types, Unison.Merge.TwoOrThreeWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Internal.Types, Unison.Merge.TwoOrThreeWay, Unison.Merge |
TwoWay | |
1 (Type/Class) | Unison.Merge.Internal.Types, Unison.Merge.TwoWay, Unison.Merge |
2 (Data Constructor) | Unison.Merge.Internal.Types, 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 |
unzip | Unison.Merge.Updated |
unzipMap | Unison.Merge.TwoWay |
unzipWith | Unison.Merge.Updated |
Updated | |
1 (Data Constructor) | Unison.Merge.Updated, Unison.Merge |
2 (Type/Class) | Unison.Merge.Updated, Unison.Merge |
updatedToThreeWay | Unison.Merge.TwoWay |
value | |
1 (Function) | Unison.Merge.EitherWay |
2 (Function) | Unison.Merge.EitherWayI |
who_ | |
1 (Function) | Unison.Merge.TwoWay |
2 (Function) | Unison.Merge.TwoWayI |
zipWith | Unison.Merge.Updated |