Make conflicts detectable with errors.Is#165

ian-oneleet wants to merge 1 commit into

bluekeyes:masterbluekeyes/patch2pr:masterfrom

ian-oneleet:conflict-sentinel-errorsian-oneleet/patch2pr:conflict-sentinel-errorsCopy head branch name to clipboard