Arya Irani 14489cc2ed Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase ... # Conflicts: # parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs # parser-typechecker/src/Unison/CommandLine/OutputMessages.hs # parser-typechecker/src/Unison/PrettyPrintEnv.hs # unison-src/transcripts/merges.output.md # unison-src/transcripts/reflog.output.md # unison-src/transcripts/squash.output.md		2021-11-11 12:06:00 -05:00
..
src/Unison	Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase	2021-11-11 12:06:00 -05:00
LICENSE	Update and standardize licenses	2021-10-12 13:47:08 -06:00
package.yaml	Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase	2021-11-02 11:09:55 -04:00
unison-core1.cabal	Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase	2021-11-02 11:09:55 -04:00