Michael ODonnell wrote: >>A decent file comparison and merge tool. > > > tkdiff may not be exactly what you're looking > for, but it's still pretty darned cool... > tkdiff is excellent. There's also a gnome tool that works similarly called gtkdiff (I think).