Linux 的图形化 DIFF 程序
我真的很喜欢用于 PC 的图形 DIFF 程序的 Araxis Merge。 不过,我不知道 linux 有什么可用的。 我们在 z800 大型机上运行 SUSE Linux。 如果我能得到一些关于其他人喜欢哪些节目的建议,我将不胜感激。
I really like Araxis Merge for a graphical DIFF program for the PC. I have no idea what's available for linux, though. We're running SUSE linux on our z800 mainframe.
I'd be most grateful if I could get a few pointers to what programs everyone else likes.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(13)
我使用 Guiffy 并且效果很好。
(来源:guiffy.org)
I use Guiffy and it works well.
(source: guiffy.org)
我通常需要从 subversion 存储库中区分代码,到目前为止 eclipse 对我来说工作得非常好......我使用 KDiff3 进行其他工作。
I generally need to diff codes from subversion repositories and so far eclipse has worked really nicely for me... I use KDiff3 for other works.
如果您使用 SVN(颠覆)源代码控制,Subclipse for Eclipse 有一个出色的图形差异插件。
Subclipse for Eclipse has an excellent graphical diff plugin if you are using SVN (subversion) source control.
有 SourceGear 的 DiffMerge。 这个很不错。 Araxis Merge 是我怀念 Windows 中的程序之一。 我想知道它在 Wine 下是否有效;)可能需要尝试一下
There is DiffMerge from SourceGear. It's pretty good. Araxis Merge is one of the programs I miss from Windows. I wonder if it works under Wine ;) Might have to give it a try
Kompare 适合 diff,但我使用 dirdiff。 虽然它看起来很丑,但 dirdiff 可以进行 3 路合并 - 并且您可以在工具内完成所有操作(差异和合并)。
Kompare is fine for diff, but I use dirdiff. Although it looks ugly, dirdiff can do 3-way merge - and you can get everything done inside the tool (both diff and merge).
Meld 和 KDiff 是最流行的两个。
Meld and KDiff are two of the most popular.
如果您想要的话,xxdiff 是轻量级的。
xxdiff is lightweight if that's what you're after.
我用过一次Meld,感觉很不错,以后可能会多尝试。 如果你熟悉 vim,vimdiff 就可以很好地工作。 最后我要提到的是,我发现 xxdiff 在快速比较方面做得相当不错。 有很多 diff 程序都做得很好。
I have used Meld once, which seemed very nice, and I may try more often. vimdiff works well, if you know vim well. Lastly I would mention I've found xxdiff does a reasonable job for a quick comparison. There are many diff programs out there which do a good job.
如果您使用 Vim,则可以使用内置的 diff 功能。
vim -d file1 file2
将带您直接进入差异屏幕,您可以在其中进行各种合并和删除。If you use Vim, you can use the inbuilt diff functionality.
vim -d file1 file2
takes you right into the diff screen, where you can do all sort of merge and deletes.BeyondCompare 也刚刚发布了 Linux 版本。
不是免费的,但 Windows 版本物有所值 - 我假设 Linux 版本是相同的。
BeyondCompare has also just been released in a Linux version.
Not free, but the Windows version is worth every penny - I'm assuming the Linux version is the same.
Diffuse 也非常好。
它甚至可以让您轻松调整线条的匹配方式,
通过定义匹配点。
Diffuse is also very good.
It even lets you easily adjust how lines are matched up,
by defining match-points.
Emacs 附带 Ediff。
这是 Ediff 的样子
Emacs comes with Ediff.
Here is what Ediff looks like
我知道两个图形差异程序: Meld 和 KDiff3。 我没有使用过 KDiff3,但 Meld 对我来说效果很好。
似乎两者都在 openSUSE 11.0 的标准包存储库中
I know of two graphical diff programs: Meld and KDiff3. I haven't used KDiff3, but Meld works well for me.
It seems that both are in the standard package repositories for openSUSE 11.0