paulaltin

Results 4 comments of paulaltin

It seems that macOS 13 changed from GNU diff to "Apple diff": macOS 12: ``` $ diff --version diff (GNU diffutils) 2.8.1 Copyright (C) 2002 Free Software Foundation, Inc. ```...

Similar issue: https://github.com/NixOS/nix/issues/7286

I've pushed a commit (56d503a098f619476d03d29bf67514e6023433ab) 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...

> I've pushed a commit ([56d503a](https://github.com/paulaltin/git-subline-merge/commit/56d503a098f619476d03d29bf67514e6023433ab)) to work around this issue, so the "unrecognized option" error message won't be displayed on macOS any more. The workaround was relying on process...