New version

2020-06-02T03:57:50.008000Z

Hi could you help to use on Win10x64 to use full resource,
I thinks "32bit code" limits the funtionality of this tool.
hope that conversion to 64bit on Win10 also. Thanks a lot for share.

removed from ubuntu 20.04

2020-05-19T15:13:41.281000Z

I was sade to note that diffuse was removed from Ubuntu 20.04. Ubuntu normally just follows Debian, and Debian seems to have removed it due to the dependency on PyGTK. Has anyone evaluated how much work it would be to move to PyGObject? Or do I have to get used to Meld? I much prefer the way Diffuse handles aligning non-different regions, keyboard shortcuts, and probably other features I haven't yet noticed lacking in Meld.

a mode which does not insert gaps to align similar lines

2019-10-31T21:56:57.063000Z

I've looked extensively for this feature, but haven't found it yet.
It's different from Feature Request #20, but related to it.
Please point me to it, if I missed it.

Sometimes I have 2 files with the same line structure,
but different contents. I want to compare files line to line,
with no gaps inserted to line up similar lines.
That way I can see how the corresponding content compares.
As an example, if file1 is
abc
123
ABC
and file2 is
123
456
CDF
I want it to align file1:abc with file2:123
file1:123 with file2:456
file1:ABC with file2:CDF
I do not want it to align file1:123 with file2:123 with a gap inserted into file2.
Thanks
Kevin

Please consider migrating to GitHub

2017-06-30T04:32:15.772000Z

While Sourceforge has been a good host for many open source projects, the vast majority of developers are on GitHub today. Google Code and Microsoft's Codeplex have both shut down and moved their projects to GitHub.

This week I looked into the state of diff tools on Linux. Turns out there's no clear winner, but Diffuse is closest to that position. It needs more developers though, and GitHub can offer that much needed exposure.

Compare directories?

2015-09-01T00:13:47.534000Z

Here is a quick patch, that adds a --recursive <directory> option.
Usage:
diffuse { -r <rev> } -D -s --recursive <directory under="" revision="" control="">
It will open a tab for each file, comparing the specified revisions. This is particularly useful to have a 3-way diff of a (completed) merge.

Does this patch break other modes, or comparison of revision agains filesystem? Feel free to modify and integrate it.

Compare directories?

2015-08-31T11:40:38.686000Z

workaround for git:
.gitconfig
[diff]
tool = diffuse
[difftool "diffuse"]
cmd = <installationdir>/Diffuse/diffusew.exe $LOCAL $REMOTE $MERGED
prompt = false
then issue
git difftool <commit> <commit>

Compare directories?

2015-08-31T11:19:10.746000Z

+1. I like the tool very much for it being able to directly use my .git revisions. But directory comparison would be a killer feature, e.g. for doing a 3-way or even N-way diff AFTER a git merge...

Just a thought: To navigate the tree of files, rather than switching forth and back (depth first?) between files, an explorer-like side-panel would be nice/necessary. But for navigating a repository, files might be added or deleted in one of the revisions, so the tree would have to eventually support the union of all trees of all revisions touched...

I'm a python noob and was looking into the code and am a bit frightened about that single file of 8500 lines... Well, I did only look into the code for 5 minutes now... I'll try to figure it out.
On my wishlist would be a better structuring of the application into multiple files, so potential contributors find their way around easier and commits/changes are less likely to conflict.

Recent posts to Discussion

New version

removed from ubuntu 20.04

a mode which does not insert gaps to align similar lines

Please consider migrating to GitHub

Compare directories?

Compare directories?

Compare directories?