Skip to content

Look for Sublime Merge inside its real bundle #809

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.

Sign up for GitHub

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

Merged
SimonCropp merged 1 commit into from
Aug 22, 2026
Merged

Look for Sublime Merge inside its real bundle #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/diff-tool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,6 +1365,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge);
mergetool "tempFile.txt" "targetFile.txt"
```
* Scanned paths:
* `/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge`
* `/Applications/smerge.app/Contents/MacOS/smerge`
* `%PATH%smerge`

Expand Down
1 change: 1 addition & 0 deletions src/DiffEngine.Tests/diffTools.include.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,7 @@ DiffTools.UseOrder(DiffTool.SublimeMerge);
mergetool "tempFile.txt" "targetFile.txt"
```
* Scanned paths:
* `/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge`
* `/Applications/smerge.app/Contents/MacOS/smerge`
* `%PATH%smerge`

Expand Down
6 changes: 6 additions & 0 deletions src/DiffEngine/Implementation/SublimeMerge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ public static Definition SublimeMerge()
Osx: new(
"smerge",
launchArguments,
// The bundle is "Sublime Merge.app", and the command line tool inside it lives
// under SharedSupport/bin rather than MacOS - which holds the GUI binary. The
// one path listed here named neither, so a Mac install was never found by
// directory search and only resolved for someone who had put smerge on PATH
// themselves
"/Applications/Sublime Merge.app/Contents/SharedSupport/bin/",
"/Applications/smerge.app/Contents/MacOS/")),
Notes: " * While SublimeMerge is not MDI, it is treated as MDI since it uses a single shared process to managing multiple windows. As such it is not possible to close a Sublime merge process for a specific diff. [Vote for this feature](https://github.com/sublimehq/sublime_merge/issues/1168)");
}
Expand Down
Loading