delta/exim4.git - git.exim.org: exim.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	meta: git controls for text changelogs; github controls	Phil Pennock	2018-02-25	1	-0/+7
	For the ChangeLog and files like it, use `merge=union` to bring in content from both sides instead of having conflicts block merges because someone else added a feature. For GitHub, provide some "templates" which really just point people in the right direction, but if the repointing fails, at least reduces the pain a little.