Skip to content

Instantly share code, notes, and snippets.

@vpack
Created July 11, 2016 15:36
Show Gist options
  • Save vpack/665dd2e46ca74111229e04c7fa389011 to your computer and use it in GitHub Desktop.
Save vpack/665dd2e46ca74111229e04c7fa389011 to your computer and use it in GitHub Desktop.
vimdiff

Simple and easy way to compare old and new files especially working with git merge.

vimdiff file1 file2
vim -d file1 file2

Commands:

]c - next diff
[c - prev diff
do - Diff obtain
dp - Diff put

Prereq : Vim split view 'sp' commands to switch between windows.

Ref:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment