What i use is the eclipse whith the E-P-I-C plugin (great for it's cvs implementation, the editor .. well ... you could step over to gvim :) ), but you might also consider this free tool
"We all agree on the necessity of compromise. We just can't agree on when it's necessary to compromise." - Larry Wall.