feat: diff3-style three-way conflict output in .rej files#28

raiderrobert merged 1 commit into

mainraiderrobert/diecut:mainfrom

feat/diff3-conflict-formatraiderrobert/diecut:feat/diff3-conflict-formatCopy head branch name to clipboard