diff using vim

Run vim with diff option

$ FILENAME=ab.c; vim -d ./${FILENAME} ~/src/folder/${FILENAME}

]c # To next change

[c # To previous change

dp # put changes to the other file

do # obtain changes from the other file

http://blog.tplus1.com/blog/2007/08/29/how-to-use-vimdiff-as-the-subversion-diff-tool/

http://unix.stackexchange.com/questions/52754/whats-the-recommended-way-of-copying-changes-with-vimdiff

http://stackoverflow.com/questions/14377505/navigate-to-next-conflict-with-vimdiff