Just some hints which might be useful for vim users
´gg´
´G´
´20gg´
´{´
´}´
´(´
´)´
´gq{´
´ggVGgq´
´:%s/from/to/g´
The default colorscheme (on Gentoo) for vimdiff (or vim -d) is unusable. The elflord color scheme is better. In vim, type
vimdiff
vim -d
:colorscheme elflord