NR for Source code indexing/editor and Diff tool.
Used to exotic tools like source in sight and araxis Merge. Now working for a smaller company, so don't want to drain their resources. Looking for some free/open source editor(cross referencing/indexing is very important) and merge tool with decent GUI. Going back to VIM and ctags just like college is an option too, but would love some GUI. I see a lot of options but looking for some suggestions from people here.