OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh

RSS
Download List

项目描述

Diffuse is a graphical tool for comparing and merging text files. It can work with many revision control systems as a diff viewer or merge tool. Diffuse is able to compare an arbitrary number of files side-by-side (n-way merge), and gives the user the ability to manually correct line matching and directly edit the files.

系统要求

System requirement is not defined
Information regarding Project Releases and Project Resources. Note that the information here is a quote from Freecode.com page, and the downloads themselves may not be hosted on OSDN.

2011-11-03 16:40
0.4.6

此版本添加了对颠覆 1.7 的支持。发现由特定提交修改的文件的命令行选项已经更新，与所有受支持的漫反射的版本控制系统的工作和现在有一个相应的菜单项。此版本还修复了造成错误的修订工作中 Mercurial，树枝上时要显示的 bug，并更新 Git 支持来区别分阶段和 unstaged 文件。语法突出显示已添加的 R 文件了。
标签: Minor feature enhancements
This release adds support for Subversion 1.7. The command line option for discovering files modified by a particular commit has been updated to work with all version control systems supported by Diffuse and now has a corresponding menu item. This release also fixes a bug that caused the wrong revision to be shown when working on a branch in Mercurial, and updates Git support to distinguish between staged and unstaged files. Syntax highlighting has been added for R files.

2011-07-13 23:21
0.4.5

弥漫现在包括意大利的本地化。已添加的命令行参数显示，而不是实际的文件名的标签（ - 标签或-大号）和选项开始在一个给定的行的光标（ - 线）。而且，新的菜单项到第一个和最后一个标签，语法突出JSON文件，以及优先显示右边距。弥漫现在使用的耐心差异为基础的算法的对齐线。现在的状态信息存储在~~ / .local /共享/弥漫。还修复了一些小的错误。
标签: Minor feature enhancements
Diffuse now includes an Italian localization. Command line arguments to show a label instead of the actual file name (--label or -L) and an option to start the cursor at a given line (--line) have been added. Also new are menu items to go to the first and last tab, syntax highlighting for JSON files, and a preference to display the right margin. Diffuse now uses a patience diff-based algorithm to align lines. State information is now stored in ~/.local/share/diffuse. Several minor bugs were also fixed.

2010-10-22 01:50
0.4.4

漫现在包括韩国和俄罗斯的本地化。 Git的支持，现在认识到冲突发生时重新应用藏匿。搜索对话框会自动填充当前选定的文本。按住Shift键滚轮现在可以使用水平滚动条。窗格标题现在有工具提示，允许长文件名方便观看。修正了几个错误，阻止他们从路径中含有非英文字符的文件工作分散。
标签: Minor feature enhancements
Diffuse now includes Korean and Russian localizations. Git support now recognizes conflicts that occur when re-applying the stash. The search dialog is automatically populated with the currently selected text. Shift-ScrollWheel can now be used to scroll horizontally. Pane headers now have tool tips allowing easy viewing of long file names. Several bugs were fixed that prevented Diffuse from working with files containing non-English characters in their paths.

2010-04-15 21:32
0.4.3

一个错误是固定的，不让打开三路合并冲突的颠覆与市集“- m”的选项。
标签: minor bug fixes
A bug was fixed that prevented the "-m" option from opening a 3-way merge for Subversion and Bazaar conflicts.

2010-04-13 22:30
0.4.2

现在认识到脱离弥漫的Git存储库和RCS的管理文件。该编辑器，现在更多的编辑删除不必要的空白行侵略性和鼠标支持水平滚动。该文件的内容的第一行是现在用于帮助确定合适的语法高亮如果它不能从文件的扩展名决定的。一位西班牙本地化已添加。
标签: Minor feature enhancements
Diffuse now recognizes detached Git repositories and files managed by RCS. The editor is now more aggressive in removing unnecessary blank edit lines and supports horizontal mouse scrolling. The first line of a file's contents is now used to help determine the appropriate syntax highlighting if it could not be determined from the file extension. A Spanish localization has been added.

Project Resources

Project Page 首页