I have found Sublime Text and Sublime Merge to server me well with sort of `GTD` like approach (not orthodox one though). Finding in files + `regexp` works perfectly fine for most of my notes related to projects. Sublime Merge serves as a history keeper.