conflicts: allow missing newlines at end of file (based on `[noeol]` marker)#5181

Draft

scott2000 wants to merge 3 commits intojj-vcs:mainfrom scott2000:conflict-missing-newline

+383-110

Commits on Jan 2, 2025