DenkzeitWiki

Diff

• Wikipedia:Diff
• http://www.eecs.berkeley.edu/~gene/Papers/diff.pdf --An O(ND) Difference Algorithm and Its Variations (EMyers?)
• http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html --Unified diff format -short explanation
• http://www.linuxjournal.com/article/1237 --Diff, Patch, and Friends
• http://www.araxis.com/merge/topic_diff_report_unified.html
  • It's oh so simple:

Lines that should be removed from the first file to create the second are prefixed with a hyphen. Lines that should be removed from the second file to create the first are prefixed with a plus sign. Unchanged context lines have no prefix.

Algorithm

• http://www.merriampark.com/ld.htm --Levenshtein Distance, in Three Flavors
  • there is an implementation in python
    
  
  
• http://www.codeproject.com/csharp/DiffEngine.asp --A Generic, Reusable Diff Algorithm in C# - II

Tools

• http://geekswithblogs.net/flanakin/articles/CompareDiffTools.aspx --Comparison: Diff Tools
  
  
• http://winmerge.sourceforge.net/ --WinMerge?
• http://kdiff3.sourceforge.net/ --KDiff3?
  • Integration in Subversion (via config-file):

  [helpers]
 diff-cmd = J:\Programme\KDiff3\kdiff3.exe
 diff3-cmd = J:\Programme\KDiff3\kdiff3.exe 
 diff-has-program-arg = true 
 diff3-has-program-arg = true

• PSPad does diff!
• TortoiseMerge
  • Looks very fine.