Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diffuse: new package #731

Closed
wants to merge 1 commit into from
Closed

diffuse: new package #731

wants to merge 1 commit into from

Conversation

bjornfor
Copy link
Contributor

@bjornfor bjornfor commented Jul 8, 2013

Diffuse is a graphical diff and merge tool.
http://diffuse.sourceforge.net/

Diffuse is a graphical diff and merge tool.
http://diffuse.sourceforge.net/
@vcunat vcunat closed this in e3a67bb Jul 8, 2013
@vcunat
Copy link
Member

vcunat commented Jul 8, 2013

Looks like a nice tool, thanks! I'm only missing directory diffs so far.

@bjornfor
Copy link
Contributor Author

bjornfor commented Jul 8, 2013

@viric: I was going to suggest you try Meld (http://meldmerge.org/) for directory diff, but it seems you are the one who added it to nixpkgs :-)

But yes, diffuse has nice diffing; it highlights character diffs inside lines (not just whole lines diff).

@bjornfor bjornfor deleted the diffuse branch July 8, 2013 12:30
@bjornfor
Copy link
Contributor Author

bjornfor commented Jul 8, 2013

@vcunat: sorry, talk about misreading a nick, I thought you were @viric :-)

@vcunat
Copy link
Member

vcunat commented Jul 8, 2013

I do use meld a lot, especially for the directory diff ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants