| Safe Haskell | Safe-Inferred |
|---|---|
| Language | Haskell2010 |
Darcs.Patch.V3.Resolution
Contents
Description
Conflict resolution for RepoPatchV3
Orphan instances
| (SignedId name, StorableId name, PrimPatch prim) => Conflict (RepoPatchV3 name prim) Source # | |
Methods isConflicted :: RepoPatchV3 name prim wX wY -> Bool Source # resolveConflicts :: RL (RepoPatchV3 name prim) wO wX -> RL (RepoPatchV3 name prim) wX wY -> [ConflictDetails (PrimOf (RepoPatchV3 name prim)) wY] Source # | |