With recent git versions you can git add -N the file (or –intent-to-add), which adds a zero-length blob to the index at that location. The upshot is that your “untracked” file now becomes a modification to add all the content to this zero-length file, and that shows up in the “git diff” output. git diff … Read more
You can read a post from Bram Cohen, the author of the patience diff algorithm, but I found this blog post to summarize the patience diff algorithm very well: Patience Diff, instead, focuses its energy on the low-frequency high-content lines which serve as markers or signatures of important content in the text. It is still … Read more
You can use ndiff in the difflib module to do this. It has all the information necessary to convert one string into another string. A simple example: import difflib cases=[(‘afrykanerskojęzyczny’, ‘afrykanerskojęzycznym’), (‘afrykanerskojęzyczni’, ‘nieafrykanerskojęzyczni’), (‘afrykanerskojęzycznym’, ‘afrykanerskojęzyczny’), (‘nieafrykanerskojęzyczni’, ‘afrykanerskojęzyczni’), (‘nieafrynerskojęzyczni’, ‘afrykanerskojzyczni’), (‘abcdefg’,’xac’)] for a,b in cases: print(‘{} => {}’.format(a,b)) for i,s in enumerate(difflib.ndiff(a, b)): if s[0]==’ ‘: … Read more
My own favorites are these two: compare image1 image2 -compose src diff.png compare image1 image2 -compose src diff.pdf The only difference between the 2 commands above: the first one shows the visual difference between the two images as a PNG file, the second one as a PDF. The resulting diff file displays all pixels which … Read more
You can grab the COM component that uses Google’s Diff/Patch/Match. It works from .NET. Update, 2010 Oct 17: The Google Diff/Patch/Merge code has been ported to C#. The COM component still works, but if you’re coming from .NET, you’ll wanna use the .NET port directly.
There is one such function implemented in the comments of array_diff. function arrayRecursiveDiff($aArray1, $aArray2) { $aReturn = array(); foreach ($aArray1 as $mKey => $mValue) { if (array_key_exists($mKey, $aArray2)) { if (is_array($mValue)) { $aRecursiveDiff = arrayRecursiveDiff($mValue, $aArray2[$mKey]); if (count($aRecursiveDiff)) { $aReturn[$mKey] = $aRecursiveDiff; } } else { if ($mValue != $aArray2[$mKey]) { $aReturn[$mKey] = $mValue; } … Read more
This library seems to do the trick: google-diff-match-patch. It can create a patch string from differences and allow to reapply the patch. edit: Another solution might be to https://code.google.com/p/java-diff-utils/
GitHub suggests that you should make sure to only use \n as a newline character in git-handled repos. There’s an option to auto-convert: $ git config –global core.autocrlf true Of course, this is said to convert crlf to lf, while you want to convert cr to lf. I hope this still works … And then … Read more
An O(ND) Difference Algorithm and its Variations is a fantastic paper and you may want to start there. It includes pseudo-code and a nice visualization of the graph traversals involved in doing the diff. Section 4 of the paper introduces some refinements to the algorithm that make it very effective. Successfully implementing this will leave … Read more
I’ve been struggling with this problem for a while, and just discovered (for me) a perfect solution: $ git config –global diff.tool vimdiff # or merge.tool to get merging too! $ git difftool commit1 commit2 git difftool takes the same arguments as git diff would, but runs a diff program of your choice instead of … Read more