fix: preserve trailing newlines in text-based 3-way merges - #2891

fix: preserve trailing newlines in text-based 3-way merges#2891

Erik Osterman (Cloud Posse) (osterman) merged 8 commits into

cloudposse:maincloudposse/atmos:mainfrom

jorrite:fix-scaffold-update-text-newlinejorrite/atmos:fix-scaffold-update-text-newlineCopy head branch name to clipboard