4 Commits

Author	SHA1	Message	Date
embeddedt	f77221d6d8	Fix missing newline [skip ci]	2023-06-19 20:58:51 -04:00
embeddedt	a72ebc4c26	Avoid printing "automatic merge went well" message [skip ci]	2023-06-13 17:53:05 -04:00
embeddedt	f7d66257fb	Allow resolving merge conflicts inside propagator [skip ci]	2023-06-13 17:52:31 -04:00
embeddedt	99e030ce27	Add script for auto-propagating changes to modern branches where possible [skip ci]	2023-06-11 20:44:39 -04:00