download the new version for windows Скачать

Full inline diffs of each change can be displayed via the right-click context menu, or keyboard shortcuts.

The following diff-related commands were added:

API methods t_reference_document() and View.reset_reference_document() allow controlling the diff.

The git_diff_target setting controls base document source.

In coordination with the new Git functionality, diffs can be calculated against HEAD or the index.

The setting mini_diff controls incremental diff behavior.

Diff markers show added, modified and deleted lines.

All changes to a document are now represented by dedicated markers in the gutter.

All file reads are done through a custom, high-performance Git library written for Sublime Merge.The setting show_git_status allows disabling Git integration.Themes may customize the display of sidebar badges and status bar information.Commands have been added to open a repository, see file or folder history, or blame a file in Sublime Merge.The current Git branch and number of modifications is displayed in the status bar.

Ignored files and folders are visually de-emphasized.Files and folders in the sidebar will now display badges to indicate Git status.See also the Announcement Post NEW: Git Integration API: Fixed regression with phantoms interfering with home/end behavior.API: Fixed an incompatibility with SublimeREPL.Linux: Fixed incorrect file ownership in the deb packages.Linux: Tweaked the way text scaling is handled.Linux: Improved high dpi handling under KDE.Linux: Fixed compatibility with old Linux distributions.Mac: Added a workaround for a MacOS issue with DisplayLink adapters.Fixed swap_line_up and swap_line_down transforming tabs into spaces.Fixed block carets changing the way text selection works.Improved scrolling logic in some scenarios.Improved file indexing behavior in some scenarios.Fixed a crash in the Git repository handling.Git: Fixed UTF8 BOMs not being handled correctly in.Git: Improved performance with a large number of git repositories in the side bar.This can be changed via the allow_git_home_dir setting. Git: Git repositories at the top level of a users home directory are ignored for performance reasons.Various syntax highlighting improvements.

Download the new version for windows Скачать