renamed webby to hypermedia

[feisty_meow.git] / walrus / coding / tools / merge_and_compare / good_merge_tools.txt

diff --git a/walrus/coding/tools/merge_and_compare/good_merge_tools.txt b/walrus/coding/tools/merge_and_compare/good_merge_tools.txt
new file mode 100644 (file)
index 0000000..8661e17
--- /dev/null
+++ b/walrus/coding/tools/merge_and_compare/good_merge_tools.txt
@@ -0,0 +1,10 @@
+
+meld: compare tool that works great, and is available on most platforms
+http://meldmerge.org/
+
+vimdiff: visual differences for the console oriented
+http://vimdoc.sourceforge.net/htmldoc/diff.html
+
+winmerge: if stuck on windows, this works pretty well
+http://winmerge.org/?lang=en
+