CompareMerge 是一款用于 Mac文件比较和合并工具。对于查看版本之间的更改，然后合并版本之间的更改很有用。
主要功能：
比较文件夹/文件：可以比较2个文件或2个文件夹
快速比较文件夹：允许快速比较两个文件夹的文件的大小或日期，或两者兼而有之或内容完整（较慢）
空白比较：允许创建空白编辑窗口以比较文本，然后保存
自定义主题颜色：用户可以选择预定义的主题颜色或自定义编辑文本颜色，背景颜色…。
在线编辑（同时编辑/合并）：比较和合并2个文本文件：允许您在同一窗口中编辑/比较/合并2个文本文件
行号：编辑文件时，显示行号将使您更容易知道确切的更改位置。
生成补丁：该应用程序还包含补丁生成功能。
文件过滤器：包括或排除与正则表达式匹配的文件。除此之外，比较两个文件夹后，您可以根据文件名过滤显示项目。
包含子文件夹：此选项可让您控制文件夹比较的深度。启用它会比较所有文件夹级别
复制到：比较2个文件夹后，您可以选择向左或向右文件复制到其他位置（例如：发布更改源时）
DELETE Left / Right / Both：比较2个文件夹后，您可以选择要删除的左文件或右文件
忽略大小写，空格：允许在“编辑/合并”窗口中忽略大小写，空格
IGNORE结束行代码：在编辑模式下，可以忽略结束行代码（Mac，Unix文件为LF，Windows文件为CR-LF或Mac经典文件为CR）中的差异。注意：比较文件夹时，不会忽略EOL。
导出/创建报告：允许将比较/合并结果导出到剪贴板或文件（支持格式：CSV，文本，HTML）
其他功能：
语法突出显示
主题颜色
导出到zip文件
用户可以比较隐藏文件，文件夹（例如：.git文件夹）
允许合并binary-plist文件
在编辑模式下，会显示一个小视图以显示确切的文字差异
CompareMerge is a software tool for file comparison and merging text-like files.
It is useful for determining what has changed between versions, and then merging changes between versions.
Functions of the application:
– SUPPORT MULTI-LANGUAGES:
English
Deutsch
Français
日本語
한국어
Español
Português
Čeština
Dansk
Suomi
Italiano
Nederlands
Norsk
Polski
Русский
Svenska
ไทย
Türkçe
Tiếng Việt
中文（中国）
中文（台灣）
– COMPARE FOLDERS/FILES: can compare both 2 files or 2 folders
– QUICK COMPARE FOLDERS: allow to quickly compare two folders’ files by size or date or both or with full content (slower)
– BLANK COMPARE: Allow to create blank edit window to compare text then save later
– CUSTOM THEME COLOR: User can select predefined theme color or customize edit text color, background color….
– INLINE EDIT (Edit/Merge at the same time) : Compare and Merge 2 text files: allow you to edit/compare/merge 2 text files in the same windows
– LINE NUMBER: When edit file, showing line number will make it easier to know exactly changes positions.
– GENERATE PATCH: the application also contains patch generating capabilities.
– FILE FILTERS: Include or exclude files that match regular expressions. Other than that, after compare 2 folders, you could filter display item base
on file name.
– INCLUDE SUBFOLDERS: This option lets you control the depth of a folder comparison. Enabling it compares all folder levels
– COPY TO: after compare 2 folder, you can select left or right files to copy to different location (example: when release change source)
– DELETE Left/Right/Both: after compare 2 folder, you can select left or right files to delete
– IGNORE CASE, SPACE: Allow to ignore Case, Space in Edit/Merge window
– IGNORE End-Line code: Allow to ignore difference in End Line Code (LF for Mac・Unix file, CR-LF for Windows file, or CR for Mac classic file) in Edit
mode.
Note: when compare folders, EOL was not ignored.
– EXPORT / CREATE REPORT: Allow to export compare/merge result to clipboard or to files (support formats: CSV, Text, HTML)
OTHER FUNCTIONS:
– Syntax highlight
– Theme color
– Export to zip file
– User can compare hidden files, folder (example: .git folder)
– Allow to merge binary-plist file
– In edit mode, a small view is show to the exact text difference
Compatibility: OS X 10.11 or later, 64-bit processor
Homepage