walrus/coding/tools/merge_and_compare/good_merge_tools.txt

   1
   2 meld: compare tool that works great, and is available on most platforms
   3 http://meldmerge.org/
   4
   5 vimdiff: visual differences for the console oriented
   6 http://vimdoc.sourceforge.net/htmldoc/diff.html
   7
   8 winmerge: if stuck on windows, this works pretty well
   9 http://winmerge.org/?lang=en
  10