비밀번호 확인 닫기


 
상품 상세 설명
 
 
   프로그래밍 > 소스/코드/버전관리 > Araxis Merge Professional
 
 
 
이전상품 Araxis Merge Professional 다음상품
 
 
 
제조회사 : Araxis Ltd.
판매가격 : 407,000 (VAT 포함)
공급방식 : ESD
수량 EA
 
 
상품 상세 설명
 
 
 



Araxis Merge comes in two editions. Only the Professional Edition offers three-way comparison, three-way merging, and related features. The Standard Edition is otherwise identical, but features only two-way comparison and merging.

 

COMPATIBILITY

FEATURE

EDITIONS

 

BENEFIT

Cross-platform licence

Standard

Professional

A single licence enables you to use both the Windows and macOS versions of Merge.

64-bit

Standard

Professional

Compare huge files (for example, 100 MB or larger). Merge is able to take advantage of the very large amounts of memory potentially available on modern 64-bit systems.

Retina/high-DPI display support

Standard

Professional

Make the most of Mac Retina displays and high-resolution PC screens utilizing 100%–500% UI scaling.

FILE COMPARISON AND MERGING

FEATURE

EDITIONS

 

BENEFIT

File comparison and merging Instant Overview

Standard

Professional

Learn how to compare and merge files with Merge in just a few minutes. Discover: WindowsmacOS

Two-way text comparison

Standard

Professional

Identify insertions, removals and changes between different versions of source code, configuration files, XML documents, web pages or any other text file. Discover: WindowsmacOS

Two-way text merging

Standard

Professional

Reconcile insertions, removals and changes between different versions of source code, configuration files, XML documents, web pages or any other text file. Discover: WindowsmacOS

Three-way comparison and merging

 

Professional

Compare and merge changes in two updated revisions of a file with their common ancestor (or any other file). Use to reconcile conflicting changes made to a set of files by multiple developers or to merge branches in a source code control or software configuration management system. Discover: WindowsmacOS

Directly open and compare text from Microsoft Office (Word and Excel), OpenDocument, PDF and RTF files

Standard

Professional

Save time by directly loading and comparing popular file formats. Alternatively, you can copy text from other applications and paste it into a Merge text comparison window. Discover: WindowsmacOS

Support for archive files†

Standard

Professional

Directly compare files contained within a variety of archive formats (.zip, .tar, etc.). Discover: Windows

Numeric tolerance in text comparisons

Standard

Professional

Compare corresponding numeric values within text files and, if desired, treat them as identical if they are within a certain tolerance of one another. Discover: WindowsmacOS

Special display formatting for XML and XHTML files

Standard

Professional

See changes clearly in even the most densely formatted XML files without sacrificing the fidelity of a true textual comparison. Discover: WindowsmacOS

Binary file comparison

Standard

Professional

Compare binary data files and see differences at the byte level. Discover: WindowsmacOS

Image file comparison

Standard

Professional

Compare various types of image file and see precisely which pixels have been modified. Discover: WindowsmacOS

Comprehensive support for text-based patch files†

Standard

Professional

Review the changes described by patch files and selectively apply them to text files. Discover: Windows

Syntax highlighting

Standard

Professional

Better comprehend a wide range of source files with built-in syntax highlighting. Discover: WindowsmacOS

Reports in HTML, HTML slideshow, XML and UNIX diff format

Standard

Professional

Create reports on file comparisons for archiving, distribution or export to other applications. Annotate HTML reports by adding bookmark comments. Discover: WindowsmacOS

Bookmarks and comments

Standard

Professional

Mark points of interest. Annotate comparisons with comments and questions, before saving as a single-file archive to be emailed to other team members for review. Discover: WindowsmacOS

Single-file comparison archives

Standard

Professional

Save a comparison to a single file for archival or later review, even on a different machine. Saved file comparisons include any bookmarks and associated comments that have been created, making it possible to annotate comparisons with questions and comments, before emailing them to other team members for review. Discover: WindowsmacOS

Comparison statistics window

Standard

Professional

See a summary of the current comparison. Discover: WindowsmacOS

Integrated folder comparison

Standard

Professional

Quickly and efficiently compare and merge all the files changed between different folder hierarchies. Process entire sets or branches of source code, web pages or other text files. Discover: WindowsmacOS

Point-and-click merging

Standard

Professional

Copy inserted, removed or changed blocks of text from one file to another (or delete them) using a single mouse click. Files can be manually merged very quickly. Discover: WindowsmacOS

In-place editing

Standard

Professional

Make fine-grained changes directly to the files being compared in the file comparison window itself. You do not have to open a separate editing window. Discover: WindowsmacOS

Linking lines

Standard

Professional

Related blocks of text are graphically linked enabling you to see at a glance how files are related. Linking lines eliminate the need for blank padding lines to keep corresponding lines adjacent to one another. Discover: WindowsmacOS

Optional vertical padding in text comparisons†

Standard

Professional

Use vertical padding to align all related blocks of text being compared. Without vertical padding, the amount of text visible on screen is maximized, and files are aligned at the vertical centre of the display. Discover: Windows

Synchronization links

Standard

Professional

Users may add synchronization links to tell Merge to re-synchronize the comparison at particular points. This is particularly useful in some complex comparison scenarios. Discover: WindowsmacOS

Side-by-side text comparison with optional line-over-line detail panel

Standard

Professional

Compare text files side-by-side with linking lines showing how the files relate. An optional line-detail panel shows corresponding lines from the compared files above one another, which can be useful for files with long lines. Discover: WindowsmacOS

Optional wrapping of long lines

Standard

Professional

See all of the text within each line without having constantly to scroll from side-to-side. Discover: WindowsmacOS

Synchronized scrolling

Standard

Professional

Related parts of files are kept aligned in the vertical centre of the file comparison display as any file is scrolled. Discover: WindowsmacOS

Highlighting of changes within lines

Standard

Professional

Identify at-a-glance inserts, removals and changes made within lines down to the level of individual characters. Discover: WindowsmacOS

Automatic merging

 

Professional

Quickly and safely merge changes in two updated revisions of a file with a common ancestor (or any other file). Automatically merged text is marked with edit markers and any conflicting sections flagged for later manual processing. Automatic merging is an undoable operation, making it safe and easy to try an automatic merge speculatively to see exactly what it will do. Discover: WindowsmacOS

Mark selected lines as resolved

Standard

Professional

Lines marked as resolved are dimmed (in the same way as following an automatic merge). This makes it easy to keep track of the areas of a file with which you are finished. Discover: WindowsmacOS

Unicode and MBCS support

Standard

Professional

Compare and merge Unicode or MBCS encoded text files (ASCII files are also supported). Critical for working with many non-English language files. For the benefit of our Japanese customers, EUC-JP encoding is also supported. Discover: WindowsmacOS

Input method editor (IME) support

Standard

Professional

Facilitates convenient entry and editing of text in character-rich Asia-Pacific languages. Discover: WindowsmacOS

Overview strips

Standard

Professional

Provides an instant visual indication of the extent of the changes between files and where those changes occur. Clicking on a change in an overview strip will jump directly to that change. Discover: WindowsmacOS

Conflict highlighting

 

Professional

After an automatic merge, any conflicting sections of the files being merged are flagged for manual processing. Commands and shortcut keys are provided to jump between conflicts. Even difficult files can thus be processed swiftly using a combination of automatic and manual merging. Discover: WindowsmacOS

Edit markers

Standard

Professional

Visual history of any changes (edits or copies from another file) made to a file during the merging process. Discover: WindowsmacOS

Bookmarks

Standard

Professional

Makes it easy to mark and return to particular points of interest in a file. Discover: WindowsmacOS

Go to line

Standard

Professional

Jump directly to a line using its line number. Discover: WindowsmacOS

Read-only and modified indicators

Standard

Professional

Visual indication of whether a file is read-only and whether it has been modified since last saving. Discover: WindowsmacOS

Change summary

Standard

Professional

Indicates the number of changes between each pair of files. Discover: WindowsmacOS

Column/line number indicator

Standard

Professional

Identifies the current location of the cursor when editing a file. Discover: WindowsmacOS

Drag and drop files

Standard

Professional

Open files by dragging from Windows Explorer or macOS Finder. Discover: WindowsmacOS

Printing support

Standard

Professional

Produce a hard copy (or a PDF file on macOS, or on Windows using Adobe Acrobat Distiller) of comparisons for reference or audit. Printed comparisons contain all the highlighting and linking lines of the on-screen presentation. To save paper, you can choose to print just the pages that contain changes. Discover: WindowsmacOS

Print preview

Standard

Professional

See how a comparison printout will look before committing it to paper. Discover: WindowsmacOS

Source code control and software configuration management integration

Standard

Professional

Integrate Merge with popular editors, source code control, version control and software configuration management systems such as Mercurial, Git, Subversion and Perforce. Discover: WindowsmacOS

Automation API†

Standard

Professional

Control Merge from other applications or integrate it with your workflow. Discover: Windows

AppleScript API‡

Standard

Professional

Control Merge from other applications or integrate it with your workflow. Discover: macOS

Virtual File System (VFS) API†

Standard

Professional

Enables third parties to extend Merge to browse directly, for example, configuration management or version control repositories. Discover: Windows

.NET assembly†

Standard

Professional

Embed text comparison and reporting capabilities in your .NET web applications. Discover: Windows

VFS plugin for Mercurial

Standard

Professional

Gives Merge read-only access to files located in Mercurial repositories. Discover: WindowsmacOS

VFS plugin for Git

Standard

Professional

Gives Merge read-only access to files located in Git repositories. Discover: WindowsmacOS

VFS plugin for Subversion

Standard

Professional

Gives Merge read-only access to files and folders located in Subversion repositories. Use a Merge folder comparison to compare a Subversion client workspace against the depot. Discover: WindowsmacOS

VFS plugin for Perforce

Standard

Professional

Gives Merge read-only access to files and folders located in Perforce depots. Use a Merge folder comparison to compare a Perforce client workspace against the depot. Alternatively, directly compare different branches (or the same branch at different points in time). Discover: WindowsmacOS

VFS FTP plugin†

Standard

Professional

Enables Merge to access files and folders located on an FTP server. For example, use Merge to synchronize a local copy of a website’s content with the main site itself, provided the main site is running an FTP server. Discover: Windows

Command-line

Standard

Professional

Control Merge from other applications or integrate it with your workflow using the dedicated command-line utility. Discover: WindowsmacOS

Flexible whitespace handling

Standard

Professional

Prevents flagging of whitespace differences when whitespace is not considered important. Discover: WindowsmacOS

Flexible line ending support

Standard

Professional

Allow intelligent cross-platform file sharing: work with files containing UNIX (LF), Windows (CR LF) or Mac (CR) style line endings. Choose whether to ignore differences in line endings when comparing files. Discover: WindowsmacOS

Display line ending characters

Standard

Professional

Optionally see individual CR and LF characters to identify differences in multiple-platform originated files. Discover: WindowsmacOS

Line expressions

Standard

Professional

Ignore differences in comments, source code control keywords and other defined regular expressions when comparing files. Discover: WindowsmacOS

Block expressions

Standard

Professional

Ignore blocks of text bounded by lines matching beginning and ending regular expressions. This is especially useful for ignoring blocks of auto-generated content. Discover: WindowsmacOS

Line-pairing rules

Standard

Professional

Line-pairing rules enable Merge to pair corresponding lines in a block of changed text based on particular portions of a line. Line-pairing rules can provide excellent results for certain comparisons (e.g. those of localization files in different languages) that would otherwise provide unhelpful results. Discover: WindowsmacOS

Block indent/un-indent

Standard

Professional

Easily set the correct indentation level of entire blocks of text when merging text from different files. Discover: WindowsmacOS

Find/Replace

Standard

Professional

Search for, and optionally replace, specified text within a file or selection. Discover: WindowsmacOS

Customize fonts and colours

Standard

Professional

Change the style of presentation to suit your preferences or needs. Discover: WindowsmacOS

Customize printed headers and footers

Standard

Professional

Set the headers and footers of printed pages to suit your requirements. Discover: WindowsmacOS

Keyboard shortcuts

Standard

Professional

Save time by controlling Merge using the keyboard. Discover: WindowsmacOS

Drag and drop text editing

Standard

Professional

Conveniently move arbitrary text between files or within a file using the mouse. Discover: WindowsmacOS

Jump to next/previous change

Standard

Professional

Quickly move between changes in a file using the mouse or keyboard shortcuts. Discover: WindowsmacOS

Replace file commands

Standard

Professional

Conveniently replace the contents of one file with that of another. Useful when one revision is entirely correct and its contents need to be copied to another revision. Discover: WindowsmacOS

Tab strip

Standard

Professional

Switch between multiple file comparison windows with a single mouse click. Discover: WindowsmacOS

Toolbars or ribbon†

Standard

Professional

Easily access frequently used commands. Discover: WindowsmacOS

† Feature only available on Windows • ‡ Feature only available on macOS

FOLDER COMPARISON AND SYNCHRONIZATION

FEATURE

EDITIONS

 

BENEFIT

Folder comparison and synchronization Instant Overview

Standard

Professional

Learn how to compare and synchronize folders with Merge in a few minutes. Discover: WindowsmacOS

Two-way folder comparison

Standard

Professional

Identify file insertions, removals and changes between two folder hierarchies. Efficiently process entire sets or branches of source code, web pages or other text files. Discover: WindowsmacOS

Three-way folder comparison

 

Professional

Identify file insertions, removals and changes between two folder hierarchies and a common ancestor (or some other) folder hierarchy. Use to reconcile conflicting changes made to a set of files by multiple developers or to merge branches in a source code control or software configuration management system. Discover: WindowsmacOS

Show a file comparison for the currently selected folder comparison row

Standard

Professional

Split the display horizontally, with a file comparison shown beneath the folder comparison. Click on a row in the folder comparison to compare that row’s files in the file comparison below. Discover: WindowsmacOS

Support for archive files†

Standard

Professional

Compare a variety of archive formats (.zip, .tar, etc.) as if they were folders. Compare the contents of an archive to a folder to verify its contents, or to see which files have changed since the archive was created. Discover: Windows

Automation API†

Standard

Professional

Control Merge from other applications or integrate it with your workflow. Discover: Windows

AppleScript API‡

Standard

Professional

Control Merge from other applications or integrate it with your workflow. Discover: macOS

Virtual File System (VFS) API†

Standard

Professional

Enables third parties to extend Merge to browse directly, for example, configuration management or version control repositories. Discover: Windows

VFS plugin for Subversion

Standard

Professional

Gives Merge read-only access to files and folders located in Subversion repositories. Use a Merge folder comparison to compare a Subversion client workspace against the depot. Discover: WindowsmacOS

VFS plugin for Perforce

Standard

Professional

Gives Merge read-only access to files and folders located in Perforce depots. Use a Merge folder comparison to compare a Perforce client workspace against the depot. Alternatively, directly compare different branches (or the same branch at different points in time). Discover: WindowsmacOS

VFS FTP plugin†

Standard

Professional

Enables Merge to access files and folders located on an FTP server. For example, use Merge to synchronize a local copy of a website’s content with the main site itself, provided the main site is running an FTP server. Discover: Windows

Reports in HTML and XML format

Standard

Professional

Create reports on folder comparisons for archiving, distribution or export to other applications. A folder comparison report can, optionally, include file comparison reports for some or all of the files involved in the folder comparison. Thus it is possible, in one operation, to generate a report that is a complete record of all the differences in all of the files involved in a folder comparison. This is especially useful in code review and code audit situations. Discover: WindowsmacOS

Bookmarks and comments

Standard

Professional

Mark points of interest. Annotate comparisons with comments and questions, before saving as a single-file archive to be emailed to other team members for review. Discover: WindowsmacOS

Single-file comparison archives

Standard

Professional

Save a comparison to a single file for archival or later review, even on a different machine. Saved folder comparisons include any bookmarks and associated comments that have been created, making it possible to annotate comparisons with questions and comments, before emailing them to other team members for review. Discover: WindowsmacOS

Comparison statistics window

Standard

Professional

See a summary of the current comparison. Discover: WindowsmacOS

Folder synchronization

Standard

Professional

Reconcile differences between folder hierarchies either by copying files from one folder hierarchy to another (or even to a completely separate location) or by launching file comparisons for changed files. Efficiently process entire sets or branches of source code, web pages or other text files. Keep folder hierarchies on different machines (for example, a desktop and a laptop) in sync with one another. Discover: WindowsmacOS

Automatic folder merging

 

Professional

Quickly and safely merge changes in two updated revisions of an entire folder hierarchy with a common ancestor (or any other folder hierarchy). Files with conflicting changes are flagged for later manual processing. Discover: WindowsmacOS

Integrated file comparison

Standard

Professional

Identify and reconcile differences within corresponding files as well as between folder hierarchies by launching file comparison windows for selected files. Discover: WindowsmacOS

Printing support

Standard

Professional

Produce a hard copy (or a PDF file on macOS, or on Windows using Adobe Acrobat Distiller) of comparisons for reference or audit. Printed comparisons contain all the highlighting of the on-screen presentation. To save paper, you can choose to print just the pages that contain changes. Discover: WindowsmacOS

Print preview

Standard

Professional

See how a comparison printout will look before committing it to paper. Discover: WindowsmacOS

Visibility filters

Standard

Professional

Show only the files and folders of interest that match criteria you define. Discover: WindowsmacOS

Selection filters

Standard

Professional

Select files and folders of interest that match criteria you define. Enables complex sets of files to be selected for file merging or folder synchronization. Discover: WindowsmacOS

Thorough comparison option

Standard

Professional

Compare corresponding files in folder hierarchies using the criteria (whitespace significance, line ending handling, etc.) defined for file comparisons. Discover: WindowsmacOS

Byte-by-byte comparison option

Standard

Professional

Speed up folder comparisons by comparing corresponding files in folder hierarchies that are larger than a certain size using a quick and memory efficient byte-by-byte comparison algorithm. Discover: WindowsmacOS

Quick comparison option

Standard

Professional

Save time by performing an extremely fast folder comparison using just the sizes and timestamps of corresponding files. Discover: WindowsmacOS

Customize fonts and colours

Standard

Professional

Change the style of presentation to suit your preferences or needs. Discover: WindowsmacOS

Customize printed headers and footers

Standard

Professional

Set the headers and footers of printed pages to suit your requirements. Discover: WindowsmacOS

Drag and drop folders

Standard

Professional

Select folders for comparison by dragging from the Windows Explorer or macOS Finder. Discover: WindowsmacOS

Toolbars or ribbon†

Standard

Professional

Easily access frequently used commands. Discover: WindowsmacOS

† Feature only available on Windows • ‡ Feature only available on macOS

OTHER FEATURES

FEATURE

EDITIONS

 

BENEFIT

English and Japanese localizations

Standard

Professional

Work with a user interface and documentation fully localized into both English and Japanese.

Comprehensive documentation

Standard

Professional

Quickly find relevant documentation on the Araxis website. Discover: WindowsmacOS

Full context sensitive help

Standard

Professional

Easily find specific help for the entire product. Context sensitive help is tightly integrated with the main documentation, enabling you to read around a particular topic. Discover: WindowsmacOS

Install/uninstall support

Standard

Professional

Conveniently install and uninstall Merge from your machine. Discover: WindowsmacOS

Customizable toolbar‡

Standard

Professional

Keep toolbars uncluttered with only the buttons that you need. Discover: macOS

‡ Feature only available on macOS


 


System requirements

This release is tested and supported on 64-bit Intel versions of the following platforms:

  • Windows 11 22H2 (2022 Update)
  • Windows 11 21H2
  • Windows 10 22H2 (2022 Update)
  • Windows 10 21H2 (November 2021 Update)

The following platforms are also supported and expected to work, but not routinely tested:

  • Windows Server 2022
  • Windows Server 2019
  • macOS 13.2 Ventura (Intel and Apple silicon)
  • macOS 12.6.3 Monterey (Intel and Apple silicon)
  • macOS 11.7.3 Big Sur (Intel and Apple silicon)