:windo diffthis to see diffs between files in splits. :windo diffoff when you're done
On Sat, Apr 24, 2010 at 3:38 PM, Tony Mechelynck < [email protected]> wrote: > On 24/04/10 09:47, wik wrote: > >> 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. >> >> > See :help diff.txt > > :diffoff! > > then in the split-windows which you don't want to stay open: > > :q > > Particular case: To stop diff mode by quitting Vim, just > > :qa > > (or :xa if there are 'modified' files which you want to save before > quitting) is usually enough. > > Other ways to _start_ diff mode: > > [g]vimdiff file1 file2 > > (in the shell) or _one_ of the ex-commands > > :DiffOrig > :diffsplit filename.ext > :diffthis > > in Vim. They all have help; :DiffOrig is defined in vimrc_example.vim, or > you can copy its code from the help topic; :diffthis has to be repeated in > each of the split-windows which you want to make part of the diff. > > > Best regards, > Tony. > -- > Canada Post doesn't really charge 32 cents for a stamp. It's 2 cents > for postage and 30 cents for storage. > -- Gerald Regan, Cabinet Minister, 12/31/83 Financial > Post > > > -- > You received this message from the "vim_use" maillist. > Do not top-post! Type your reply below the text you are replying to. > For more information, visit http://www.vim.org/maillist.php > > Subscription settings: > http://groups.google.com/group/vim_use/subscribe?hl=en > -- You received this message from the "vim_use" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php
