-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Diff coloring does not work on macOS 13 Ventura #19
Comments
It seems that macOS 13 changed from GNU diff to "Apple diff": macOS 12:
macOS 13:
Apple diff doesn't support the |
Similar issue: NixOS/nix#7286 |
I've pushed a commit (56d503a) to work around this issue, so the "unrecognized option" error message won't be displayed on macOS any more. Colored diffs still don't work out of the box on Ventura, and won't unless we can figure out how to do the coloring using BSD-diff (i.e. without the #20 has also been resolved, so the README file now explains that Mac users can install GNU diffutils to get colored diffs. |
Running git-subline-merge in interactive mode on macOS 13 prints this message before each version of a conflicted hunk:
The text of the hunk follows, but has no coloring to show which parts were added or removed in each version.
The text was updated successfully, but these errors were encountered: