Use vimdiff to replace entire file?

vim merge git-merge vimdiff
mazlix picture mazlix · Jun 6, 2011 · Viewed 10.9k times · Source

I'm using vimdiff for a git merge. Is there a quick way to select 1 file to use, right now i'm just selecting everything from one buffer, replacing the $MERGE with that, and then saving. I guess I can macro that, but was wondering if there is a better way. Thanks!

Answer

sehe picture sehe · Jun 7, 2011

Several ways:

:%diffput

to do 'put' all changes from the current buffer to the 'other' buffer. This makes it easy with three-way diffs:

:%diffput OURS

The 'OURS' pattern will match uniquely on buffernames participating in the current diff

All the above can be done in reverse, substituting do or :diffget

Related questions

vimdiff as a merge tool

vimdiff helps in showing the diff of two files graphically and allows us to pick the changes from left to right/right to left. The files I am dealing with are huge files and most of the differences vimdiff reports …

Read More
How do I exit the Vim editor?

I'm stuck and cannot escape. It says: "type :quit<Enter> to quit VIM" But when I type that it simply appears in the object body.

Read More
How do I make Git use the editor of my choice for commits?

I would prefer to write my commit messages in Vim, but it is opening them in Emacs. How do I configure Git to always use Vim? Note that I want to do this globally, not just for a single project.

Read More