Download

Sublime Merge is available for 64 bit platforms only.

Version: Build 1107

Sublime Merge may be downloaded and evaluated for free, however a license must be purchased for continued use. There is currently no enforced time limit for the evaluation.

Changelog

Build 1107

12 March 2019
See also the Blog Post
  • The Contents section of the sidebar can now be switched between showing changed files and all files
  • Sublime Merge can now be used as a standalone merge tool, via the smerge command line helper. See smerge --help for details.
  • Merge tool: Improved UI for switching between the Base file and the Merged file
  • Added Navigate/Go to Parent menu item
  • Improved clone dialog
  • Improved side bar context menus
  • Various syntax highlighting improvements
  • Merge tool now indicates which lines have been modified in the merged file
  • Merge tool: swap_line_up, swap_line_down and duplicate_line commands are now supported
  • Fixed git flow commands appearing inconsistently
  • Mac: Add full support for macOS native tabs
  • Mac: Ensure context menus are shown without scrolling
  • Mac: Error message dialogs can now be closed with the escape key
  • Linux: Color glyphs are now drawn properly on light backgrounds
  • Windows: Fix DirectWrite handling of fonts with lineGap > 0

Build 1103

24 January 2019
  • New Preferences Dialog
  • New Merge Dialog
  • Added support for includeIf in Git config files
  • Various syntax highlighting improvements
  • Windows and Linux: Improved IME compatibility
  • Added Navigate to Branch
  • Added Navigate to Tag
  • Added Set Branch Upstream to the Command Palette
  • Added Hide Branch to the branch context menu
  • Added Hard Reset option to the diverged banner
  • The diverged banner now shows the exact git commands that will be run in tooltips
  • Improved behavior of clone dialog when selecting a target directory

Build 1097

6 December 2018
  • Various syntax highlighting improvements
  • Fixed backspace not discarding selected lines
  • Mac: Improved resize performance
  • Mac: Fixed missing key bindings in menu items
  • Windows: Fixed Clone dialog not working correctly
  • Windows: Updated Git Credential Manager to 1.18.1
  • Linux: GTK3 + Wayland compatibility fixes
  • Linux: Fixed GTK3 double and triple click handling
  • Linux: Fixed a crash when using GTK_IM_MODULE=xim

Build 1092

29 November 2018
See also the Blog Post
  • Added Contents view in the side bar, to focus on individual files
  • Double-clicking or pressing space in the commit graph will focus on the first file of the selected commit
  • Added Word Wrap
  • Clone: Can now change the directory name being cloned into
  • Added hide_menu setting
  • Edit Commit: Added Edit Commit Contents
  • Edit Commit: Added Fixup Commits
  • Edit Commit: Can now Drop multiple commits at once
  • Edit Commit: All Edit Commit operations now work with a detached head
  • Preferences: Can now set rulers via the preferences menu
  • Added Open Repository in Sublime Text menu item
  • Binary file detection heuristic now matches Git
  • Search help text is scrollable
  • Unicode: Improved rendering of combining characters
  • Ignore whitespace now only ignores space and tab changes, not newline changes
  • smerge blame now starts the blame from HEAD, rather than the selected commit
  • Fixed Delete Branch not always prompting for force delete when it needs to
  • Fixed line history not showing the initial commit that added the file
  • Fixed smerge blame not navigating to the target line when Sublime Merge is already running
  • Fixed search results being cleared when the repository is modified
  • Fixed viewing trees from search results not working when the commit is folded away
  • Git Flow: Fixed menu commands not working as expected
  • Fixed SSH Askpass helper only showing the first prompt line
  • Windows: Fixed handling of daylight saving time
  • Linux: Moved to GTK3

Build 1084

29 October 2018
  • Search: Added contents: operator, to find commits introducing or removing text
  • Can now ignore whitespace changes in diffs (available from the context menu)
  • Edit Commit: Added Squash Selected Commits
  • Support for core.worktree
  • Window state is now restored when re-opening a repository
  • Search: Merge commits are now automatically excluded when the query includes path:, file: or contents:. Specify min-parents: 0 to include them.
  • Location Bar: Tags are grouped into folders if they have a slash in their name
  • Tweaked commit graph rendering
  • Add new preference, time_format
  • Preferences: Default values are now indicated, rather than null
  • Preferences: Unquoted strings are accepted
  • Improved handling of network issues when working with repositories over a networked file system
  • Navigate to Commit now works as expected for hidden commits
  • Fixed context splitter showing through hunk headers
  • Fixed expand_merge_commits_by_default not being applied correctly at startup
  • Fixed bold text sometimes being applied incorrectly in the side bar
  • Fixed a blame regression in 1079
  • Mac: Added gpu_window_buffer setting, to disable usage of OpenGL

Build 1079

21 October 2018
  • Added "Merge With…" context menu to merge a branch with flags (--squash, --no-ff, etc)
  • Edit Commit: Added Move Commit Up
  • Edit Commit: Added Move Commit Down
  • Edit Commit: Added Drop Commit
  • Commit context menu tweaks
  • Location Bar: Refs are sorted via natural sorting, making numeric refs sort as expected
  • Make tag message optional for git flow finish command
  • Add git_env preference, to set the env vars git is launched with
  • Fixed a crash regression in 1075
  • Fixed stash labels having the wrong size

Build 1075

16 October 2018
  • Submodules are shown in the location bar
  • Submodules: Double clicking on a submodule will open the corresponding repository
  • Submodules: The number of modified and untracked files are shown next to each submodule
  • Submodules: New submodules can be added by right clicking in the location bar, or via the Command Palette
  • Submodules: Added functionality for Initialize, Update and Sync
  • Git Flow: Added support for git flow commands, via the Command Palette
  • Added setting expand_merge_commits_by_default, to unfold all merge commits by default
  • Show line and column position when entering a commit message
  • Partially entered commit messages are stored in the session
  • Hovering over a remote in the location bar will show its URL
  • Added key bindings for Pull and Push
  • Stage All will set input focus to the Commit Message entry box
  • Fixed Stash key bindings not being set correctly on Windows and Linux
  • Fixed per-branch ahead/behind counters not matching git output
  • Fixed entries removed from .gitmodules not being handled the same way as git
  • Fixed always visible scrollbars for submodule changes
  • Fixed a case where remote branches would be displayed incorrectly in the location bar
  • Fixed remotes with dots in their name not being parsed correctly
  • Fixed unix domain sockets showing up as untracked files
  • Windows: Updated bundled git to 2.19.1
  • Windows: Fixed extraneous horizontal scrollbar in some high dpi modes
  • Windows: Minimized and Maximized windows are now restored as expected
  • Mac: Updated bundled git to 2.19.0
  • Mac: Clicking on the dock icon will create a window if there are none

Build 1070

10 October 2018
  • Commit Folding: Merge commits are now folded by default; click on their icon to unfold
  • Location Bar: Branches can be hidden by clicking on the new eye icon
  • Location Bar: Alt-clicking will hide everything but the clicked on branch
  • Location Bar: The location bar is now a tree
  • Location Bar: Branches with slashes in their name are grouped in folders
  • Location Bar: Added per-branch ahead/behind counters
  • Location Bar: Width is stored in the session
  • Added Copy to Clipboard in the branch context menu
  • The commit message is now preserved when git commit fails
  • Added a Tools/Password Caching menu to easily setup credential caching on Linux
  • Added a git_config command to set git configuration options via the keyboard or menu
  • Clicking next to the author label no longer shows the Edit User dialog
  • Allow creating tags with empty messages
  • Fixed incorrect submodule handling with core.ignorecase turned on
  • Fixed a regression where the Continue Rebase button wasn't being shown
  • Fixed a case where git attributes weren't interpreted correctly
  • Changed handling of invalid gitignore rules, such as **\test to treat them the same way as Git
  • Fixed a crash that could occur when parsing git config files
  • Fixed a crash that could occur when closing a repository
  • Mac: Improved font rendering on Mojave
  • Mac: Fixed some commands not working when using the bundled version of git

Build 1065

2 October 2018
  • Added Stage All and Discard All buttons
  • Git worktrees are now supported
  • Support for .git directories populated with symlinks, as in AOSP
  • core.commentchar is now understood
  • Improved comment filtering when entering commit messages: only automatically generated comments will be stripped
  • Improved rename detection when viewing diffs and searching for files
  • Search: Now accepts "commit:" terms for search by commit hash
  • Restyled git error popup
  • Stash can now accept a message
  • Merge Tool: Improved LF vs CRLF selection logic
  • Fixed incorrect default value for core.excludesfiles
  • Fixed handling of backslashes in .gitignore files
  • Ctrl+F/Cmd+F no longer starts searching while in merge mode
  • Mac: Fixed windows being created offscreen in some setups
  • Mac: Fixed alpha blended windows on Mojave

Build 1062

27 September 2018
  • Fixed a regression in 1061 where unmerged files weren't updating
  • Mac: Basic support for Mojave Dark Mode

Build 1061

26 September 2018
  • Full core.ignorecase support, fixing some cases where status output differed from git
  • Added support for core.precomposedunicode
  • Added support for core.filemode
  • Added support for core.symlinks
  • Mac: Query login shell for default env vars
  • Fixed not checking $HOME/.config/git/config as a default config file path
  • Improve change descriptions for submodule changes
  • Merge Tool: Improved LF vs CRLF selection logic
  • Tweaked scroll delta when scrolling with the mouse wheel
  • Windows: Adjust $HOME calculation to match Git

Build 1058

21 September 2018
  • .gitgnore rule handling improvements
  • Improve handling of case-insensitive repositories
  • Allow committing to a detached head
  • Support for files marked --assume-unchanged and --skip-worktree
  • Fix dropping of stashes from the location bar not working correctly
  • Windows: Added SSH askpass support

Build 1055

20 September 2018
  • Welcome!