3-way diff#37

Merged

ChrisPenner merged 40 commits intomainfrom

Apr 3, 2025

Commits on Dec 30, 2024

bump unison
mitchellwrosen
committed

Commits on Jan 13, 2025

get code compiling with wundefineds
mitchellwrosen
committed

Commits on Jan 27, 2025

Return propagated updates in diff payload
mitchellwrosen
committed

Commits on Jan 30, 2025

switch over to three-way namespace diffs in `diffCausals`
mitchellwrosen
committed
delete old two-way diff stuff and consolidate modules again
mitchellwrosen
committed

Commits on Feb 3, 2025

pass through (but ignore) libdeps diffs in diffCausals
mitchellwrosen
committed

Commits on Feb 4, 2025

add libdeps diff to the json blob
mitchellwrosen
committed

Commits on Feb 5, 2025

⅄ main → share-3waydiff
mitchellwrosen
committed

Commits on Feb 12, 2025

Commits on Feb 24, 2025

Commits on Mar 3, 2025

⅄ main → share-3waydiff
mitchellwrosen
committed

Commits on Mar 17, 2025

bump unison dep
mitchellwrosen
committed

Commits on Mar 18, 2025

Commits on Mar 20, 2025

properly filter out parts of a diff that contain only constructors
mitchellwrosen
committed

Commits on Mar 27, 2025

⅄ main → share-3waydiff
mitchellwrosen
committed

Commits on Apr 1, 2025

re-enable contribution diffs background worker
mitchellwrosen
committed