Use line-by-line reading in check-merge-conflict#910

j178 merged 1 commit intomasterj178/prek:masterfrom

linewisej178/prek:linewiseCopy head branch name to clipboard