Document dependency on Gnu diff

paulaltin / git-hires-merge

An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.

GNU General Public License v3.0

62 stars 8 forks source link

Document dependency on Gnu diff #20

Closed dabrahams closed 1 year ago

dabrahams commented 1 year ago

The --old-group-format option used by git-subline-merge is not available in the BSD-based diff that comes with MacOS. I installed diffutils with Homebrew to get around it. Should be in the docs (or remove the dependency).

paulaltin commented 1 year ago

Related to #19, it seems that the version of diff bundled with macOS changed in Ventura.

paulaltin commented 1 year ago

Added in 38ced202.

dabrahams commented 1 year ago

Please see this remark