Wednesday, April 1, 2015

vimdiff - visual diff tool of command line

Vimdiff is a tool that comes bundled with Vim and its a wonderful tool for comparing code and merging changes.

Keyboard Shortcuts:

do - Get changes from other window into the current window.

dp - Put the changes from current window into the other window.

]c - Jump to the next change.

[c - Jump to the previous change.

Ctrl W + Ctrl W - Switch to the other split window.


Popular Posts

Labels

ad ( 4 ) Amazon ( 46 ) Answer ( 1 ) API ( 24 ) automation ( 1 ) blog ( 23 ) book ( 2 ) career ( 12 ) cdn ( 3 ) centos ( 1 ) cloud ( 123 ) CRM ( 24 ) current ( 13 ) data ( 14 ) database ( 64 ) design patterns ( 15 ) development ( 3 ) eCommerce ( 26 ) email ( 92 ) ETL ( 2 ) framework ( 3 ) git ( 9 ) google ( 178 ) IDE ( 15 ) Integration ( 1 ) interview ( 15 ) Java ( 394 ) Java EE ( 104 ) javascript ( 42 ) Jboss ( 4 ) JPA ( 48 ) JSF ( 45 ) linux ( 339 ) Marketing ( 20 ) mobile ( 44 ) model ( 1 ) MySQL ( 198 ) online money ( 15 ) OOP ( 7 ) open source ( 25 ) performance ( 74 ) php ( 51 ) python ( 46 ) quality ( 6 ) referral ( 3 ) restful ( 23 ) security ( 128 ) SEO ( 18 ) social ( 26 ) software ( 74 ) spam ( 4 ) Spring ( 1 ) SQL ( 22 ) system ( 32 ) testing ( 17 ) tool ( 91 ) UML ( 8 ) virtual ( 9 ) web ( 226 ) web services ( 14 ) WildFly ( 4 ) wordpress ( 9 )