Vim's diff mode is pretty cool. We like it as a light-weight merge tool that's right there on the command-line. (But of anything heavier there's always BBEdit).
Cheatsheet For vim-diff mode
:diffget |
Overwrite this line/changed section with the other buffer's changes |
:diffput [buffer number] |
Put this line/changed section's changes over onto the other buffer. (Get buffer number by using :buffer command) |
]c |
Jump to next changed section |
[c |
Jump to previous changed section |
Generic VIM buffer/"window" cheatsheet
^W ^W |
Move cursor to next window above/right of current |
^W [#] > |
Grow current window width by # (or 1) chars(?) |
:buffers |
lists buffers |
Comments:
Add comments by visiting: VimDiff/Comments