Steve Yegge 4b1e96bd3f Fix linting errors in vendored merge code ...

- Check error returns from Fprintln and Sync
- Remove unused 'merged' parameter from hasConflict
- Remaining gosec G304 warnings are baseline (file paths from git, not user input)

2025-11-06 15:41:36 -08:00

..

merge.go

Fix linting errors in vendored merge code

2025-11-06 15:41:36 -08:00