How do I only dp or do just the lines, not the entire block in Vim diff?

Posted by hobbes3 on Super User See other posts from Super User or by hobbes3
Published on 2012-03-24T16:55:54Z Indexed on 2012/03/24 17:32 UTC
Read the original article Hit count: 416

Filed under:

macvim

|

vimdiff

I'm currently using MacVim (Snapshot 64) "Split Diff by..." menu option.

The file is Django's my settings.py from version 1.3.1 to a fresh file from version 1.4.

(Open the image on a separate window/tab to enlarge.)

I know two basic commands

do to "obtain" (and replace) a block from the other side.
dp to "put" (and replace) a block to the other side.

But those two commands writes the entire block, which in MacVim is the purple highlights.

If you look at the 2nd block, you can see that from line 2 and 3 only has 2 words that are different: mysite and hobbes3. I just want to replace per line not the entire block.

So what is there a command to replace do do and dp per line as oppose to an entire block or do I have to manually type it out?

Bonus question: I noticed that once I manually edit a block, I lose the purple highlighting. How do I "refresh" the diff again to include the highlights without reopening the file?

Please try to keep the answers Vim-general as oppose to MacVim-specific. Thanks!

© Super User or respective owner

Related posts about macvim

Subversion with MacVim configured as the editor

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm using Subversion to checkin a file on OSX. I have my EDITOR variable configured to MacVim My .profile includes: export EDITOR=/Applications/MacVim/mvim When I checkin with the -m option (svn ci somefile), MacVim gets launched but then Subversion immediately displays: Log message unchanged… >>> More
MacVim, Command-T: SEGV

as seen on Super User - Search for 'Super User'
Details: OSX 10.7.4 I installed the latest MacVim via Homebrew: $ command-t brew install macvim ==> Downloading https://github.com/b4winckler/macvim/tarball/snapshot-64 Already downloaded: /Library/Caches/Homebrew/macvim-7.3-64.tgz ==> ./configure --with-features=huge --with-tlib=ncurses… >>> More
Change font size macvim?

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi there, I'm using macvim and I love it. I also happen to really like the default font. My question is: How do I change the font size in my .gvimrc? I want it to be bigger, without changing the font from the default. All the examples I've seen specify a font then a ':' then the size. So how… >>> More
MacVim and netrw - Press ENTER

as seen on Stack Overflow - Search for 'Stack Overflow'
Hey guys. I've set up MacVim to work with netrw for remote editing (yaaay!), but whenever I save a file, I get the following error: :!scp -q '/var/folders/PN/PNhWJAr5GGC0WfeLdFgWV++++TU/-Tmp-/v771493/0' 'remot_host:path/remote_file.css' Press ENTER or type command to continue Hitting ENTER removes… >>> More
Menu items messed up while using MacVim with Vim Latex

as seen on Stack Overflow - Search for 'Stack Overflow'
I just installed macvim yesterday and I have been trying to install vim latex today. The one thing I am confused about is the menu items on the top bar: ------------------------------------------------------------------------------- <apple icon> File Edit Tools Syntax TeX-Suite TeX-Environments… >>> More

Related posts about vimdiff

How Do You Get the bufspec While Using Vimdiff Through Git

as seen on Stack Overflow - Search for 'Stack Overflow'
I've read Vimdiff and Viewing differences with Vimdiff plus doing various google searches using things like "vimdiff multiple", "vimdiff git", "vimdiff commands" etc. When using do or diffg I get the error "More than two buffers in diff mode, don't know which one to use". When using diffg v:fname_in… >>> More
Vimdiff with git mergetool error: "More than two buffers in diff mode"

as seen on Stack Overflow - Search for 'Stack Overflow'
I've read Vimdiff and Viewing differences with Vimdiff plus doing various google searches using things like "vimdiff multiple", "vimdiff git", "vimdiff commands" etc. When using do or diffg I get the error "More than two buffers in diff mode, don't know which one to use". When using diffg v:fname_in… >>> More
vimdiff: Jump to next difference inside line?

as seen on Super User - Search for 'Super User'
vimdiff is very handy for comparing files. However, I often use it on files with long lines and relatively few differences inside the lines. vimdiff will correctly highlight differences inside a line (whole line pink, differing characters red). In these cases, it would be nice to be able to jump… >>> More
how you usually quiting/closing vimdiff mode?

as seen on Stack Overflow - Search for 'Stack Overflow'
Hello, I am using vim with fugitive extension http://www.vim.org/scripts/script.php?script_id=2975 It has :Gdiff command which brings you into vimdiff mode, but what is the right/quick way to close/quit vimdiff mode? i.e. let's say I am editing file FooBar.txt under git repository, then firing up… >>> More
How do I only dp or do just the lines, not the entire block in Vim diff?

as seen on Super User - Search for 'Super User'
I'm currently using MacVim (Snapshot 64) "Split Diff by..." menu option. The file is Django's my settings.py from version 1.3.1 to a fresh file from version 1.4. (Open the image on a separate window/tab to enlarge.) I know two basic commands do to "obtain" (and replace) a block from the other… >>> More