Code

merge API tweaks#5277

Code

Merged

aryairani merged 5 commits intotrunkunisonweb/unison:trunkfrom 24-08-13-merge-tweaksunisonweb/unison:24-08-13-merge-tweaksCopy head branch name to clipboardAug 13, 2024

+208-117

Commits

Commits on Aug 13, 2024

• delete unused Mergeblob2.lcaDeclNameLookup field

  mitchellwrosen

  committed
  7b315c3

  Copy full SHA for 7b315c3

• inline Mergeblob2.conflictsNames and Mergeblob2.conflictsIds

  mitchellwrosen

  committed
  4c30192

  Copy full SHA for 4c30192

• reuse unique type guids in merge after all

  mitchellwrosen

  committed
  28543ad

  Copy full SHA for 28543ad

• automatically run ormolu

  

  mitchellwrosen

  authored and

  github-actions[bot]

  committed
  6325d45

  Copy full SHA for 6325d45

• distinguish between type and term dependencies in UF.dependencies

  mitchellwrosen

  committed
  cc48213

  Copy full SHA for cc48213