Windows Freeware Diff/Merge application

I started a discussion about Diff/Merge tools on reddit.



I collected together the candidates on this list:

http://www.listible.com/list/windows-freeware-diff2Fmerge-application



The only one which was able to handle long lines is the CS-Diff. A few supports word wrapping, but none of them are flawless:

• KDiff3 have the functionality, but breaks the lines randomly, useless.
  
  
• WinMerge does the word wrapping good, but turning it on breaks keyboard navigation, and no word wrapping in the DiffPane.

Processing Tag files with Ruby

<br />#!/usr/bin/env ruby<br /><br /><br />def proctag(tagline)<br /> # {tagname}<Tab>{tagfile}<Tab>{tagaddress}[;"<Tab>{tagfield}..]<br /> # "A tagfield has a name, a colon, and a value: "name:value".<br /> # The name of the "kind:" field can be omitted. A program reading the<br /> # tags file can recognize the "kind:" field by the missing ':'.<br /><br /> ret = Array.new<br /> <br /> # tagname<br /> idxb = 0<br /> idxe = tagline.index("\t")<br /> ret[0] = tagline[idxb..idxe-1]<br /> <br /> # tagfile<br /> idxb = idxe+1<br /> idxe = tagline.index("\t",idxb)<br /> ret[1] = tagline[idxb..idxe-1]<br /> <br /> # tagaddress<br /> idxb = idxe+1<br /> idxe = tagline.index(";\"",idxb)<br /> idxe = -1 if idxe == nil<br /> ret[2] = tagline[idxb..idxe-1]<br /> <br /> # tagfields<br /> ret[3] = nil<br /> ret[4] = nil<br /> if idxe != -1<br /> fldlst = tagline[idxe+1..-1].strip.split("\t")<br /> for act in fldlst<br /> # handle kind<br /> if !act.include?(':')<br /> ret[3] = act<br /> else<br /> ret[4] = Hash.new if ret[4] == nil<br /> hm = act.split(':')<br /> ret[4][hm[0]]=hm[1]<br /> ret[3] = hm[1] if hm[0] == 'kind'<br /> end<br /> end<br /> end<br /> return ret<br />end<br /><br />while gets<br /> next if $_[0] == ?!<br /> m = proctag($_.chomp)<br /> print m[3]," ",m[0],"\n"<br />end<br />