Diff tools for Windows and Mac. Students write essays. Developers write code. Authors write stories. Editors write columns. Everyone does their own job. Yet, they are all bound by the same requirement – their job should be presented in a printed format or in soft copies. Using Meld as External Diff and Merge Tool in Source tree in Mac thomas ng Dec 03, 2014 I am trying to set up Meld as the external diff and merge tool in Source tree on my Mac laptop.
If you know one please tell me.
For the last couple of months I was trying various options for doing diffing and merging on Mac with
git
and perforce
.Perforce itself has pretty good merging tool
p4merge
and people already know how to setup it with git
. It is good, but feels slow and does not allow to do dirs diffing (at least I don’t know how to do that).The other option which I was using for a while is
FileMerge
(opendiff
). Also good tool. You can find some articles about how to set it up with git, like Integrating Git with a Visual Merge Tool, this article also tells about other tools which you can use with git.Strange that I did not see it anywhere in articles (maybe it is one of the new features in git) that you can use
-d, --dir-diff
with difftool. https://everera283.weebly.com/what-is-the-mac-keyboard-shorcut-for-direct-selection-tool.html. This is the description of this optionCopy the modified files to a temporary location and perform a directory diff on them. This mode never prompts before launching the diff tool.
For example by using it with
opendiff
You can get the list of all modified files in FileMerge window
File Comparison Tool
After that just double click on files in the list to see the diff.
In conclusion I would just say - these two tools are good, but both require some time from you for gluing them with tools you use.
If you want easier way - buy Kaleidoscope. Yes, it is expensive for the diff/merge tool. Ij network tool for mac. But yes, it is worth it. Why? Because it requires only 3 minutes to set it up with almost anything, just check Kaleidoscope integration window
Active6 years, 5 months ago
I use meld on Linux and I am able to compare two pieces of text without having to save them in files. Is there something similar for Mac and Windows?
Asad Iqbal
Asad IqbalAsad Iqbal1,5104 gold badges22 silver badges43 bronze badges
closed as off topic by martin clayton, ollo, Mario Sannum, robbrit, Laurent EtiembleApr 4 '13 at 21:47
Questions on Stack Overflow are expected to relate to programming within the scope defined by the community. Consider editing the question or leaving comments for improvement if you believe the question can be reworded to fit within the scope. Read more about reopening questions here. If this question can be reworded to fit the rules in the help center, please edit the question.
3 Answers
NotePad++ with the Compare plugin on Windows:
http://sourceforge.net/projects/npp-compare/
AnneAnnehttp://sourceforge.net/projects/npp-compare/
24.6k9 gold badges57 silver badges68 bronze badges
TextWrangler for OS X does a nice diff of either files on disk or documents being edited.
That would allow you to make two empty docs, paste your text into each of them and run the diff.
MonoloMonolo17.1k11 gold badges59 silver badges100 bronze badges
The meld tool has been ported to Mac OS X and is available via 'fink'.
You will need to install fink first however, and I believe you can get started here.
Dave NewmanDave Newman