Implement conflict marker detection + no SHA blobs in diffs

[richardgill]

No description provided.

[github-actions]

🔨 PR Build Ready!

Commit	6506f45
Version	0.0.24-pr.261.6506f45

Quick Install

curl -fsSL https://raw.githubusercontent.com/richardgill/patchy/main/install | bash -s -- --pr 261

Install via npm

npm install -g patchy-cli@pr-261

Or use directly:

npx patchy-cli@pr-261 --version

Direct Downloads

Platform	Architecture	Download
Linux	x64	patchy-linux-x64.tar.gz
Linux	arm64	patchy-linux-arm64.tar.gz
macOS	Intel	patchy-darwin-x64.zip
macOS	Apple Silicon	patchy-darwin-arm64.zip
Windows	x64	patchy-windows-x64.zip

Manual installation

# Download (replace PLATFORM with: linux-x64, linux-arm64, darwin-x64, darwin-arm64, or windows-x64)
curl -fsSL https://github.com/richardgill/patchy/releases/download/pr-261/patchy-PLATFORM.tar.gz | tar -xz

# Make executable and run
chmod +x patchy-*
./patchy-* --version

---

_{🤖 This comment updates automatically with each push. View release}