how you usually quiting/closing vimdiff mode?

Posted by wik on Stack Overflow See other posts from Stack Overflow or by wik
Published on 2010-04-24T07:45:30Z Indexed on 2010/04/24 7:53 UTC
Read the original article Hit count: 414

Filed under:

vim

|

vimdiff

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 :Gdiff, review my changes in vimdiff and want to get back and continue editing FooBar.txt or any other file :)

Thanks.

© Stack Overflow or respective owner

Related posts about vim

Vim: Use different ~/.vim/plugin/ directories for different versions of vim?

as seen on Super User - Search for 'Super User'
Like many of you, my custom Vim configuration is stored in my ~/.vimrc, with the plugins, colors, etc. stored under ~/.vim/plugins, ~/.vim/colors, etc. I want to share a single Vim configuration among many servers. Some of these servers run Vim 7, some run the older Vim 6. Most Vim plugins are intended… >>> More
Why isn't the scripts in my autoload folder being executed in Vim?

as seen on Super User - Search for 'Super User'
I'm trying to use Pathogen to manage my Vim extensions. My bundle folder looks like this: .../bundle/ +-- vim-pathogen ¦ +-- autoload ¦ +-- pathogen.vim +-- vim-smoothscroll +-- autoload +-- smooth_scroll.vim And my vimrc file includes this: let s:root = fnamemodify(resolve(expand(":p"))… >>> More
Cygwin vim doesn't load files in runtimepath

as seen on Super User - Search for 'Super User'
I created a custom syntax file, and but none of the files in $VIMRUNTIME seem to load. I followed these pieces of the documentation: http://vimdoc.sourceforge.net/htmldoc/filetype.html#new-filetype http://vimdoc.sourceforge.net/htmldoc/syntax.html#mysyntaxfile When I do :echo &runtimepath I… >>> More
Debugging matchit plugin in vim (under Cygwin)

as seen on Stack Overflow - Search for 'Stack Overflow'
The "matchit" plugin for vim is supposed to allow you to use the % key to jump between matching start/end tags when editing HTML, as well as /* and */ comment delimiters when editing other kinds of code. I've followed the exact instructions in ":help matchit", but % still doesn't work for me. It… >>> More
Vim: How to execute commands stored in a textfile opened in Vim

as seen on Super User - Search for 'Super User'
I store, commands found at http://www.commandlinefu.com/commands/browse, in a text file. If I open this text file in Vim and I want to execute the command where the cursor is actually located I do copy the line with Y, switching to command mode with : and !CTRL+r* Is there a more "lazy" possibility ;) >>> 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