Both for my own stuff, and for the typical drive-by bazaar-contributions I do, this work well.

Git version of vim with integrated patches