On 04/23/2015 02:33 AM, Erik Falor wrote: > On Thu, Apr 23, 2015 at 08:02:17AM +0200, Christian Brabandt wrote: >>> Is this vim -> vimdiff -> vim cycle achievable in vim? >> >> I don't know. But try the vcscommand >> (http://www.vim.org/scripts/script.php?script_id=90) >> plugin. > > +1 this suggestion. > > I highly recommend this plugin.
+1 from me as well. I particularly like diffing via :VCSVimDiff (<Leader>cv) and undoing the diff via :VCSGotoOriginal! (<Leader>cG). The out-of-the-box behavior of :VCSVimDiff puts your modified buffer on the left and leaves your cursor in the original file on the right. Like the original poster, I prefer to have the old (original unmodified) file on the left and to have the cursor remain in the editable buffer ready for any modifications I'd like to make. I work around this by changing the default mapping as follows: nmap <silent> <Leader>cv <Plug>VCSVimDiff<C-w>H<C-w>w Michael Henry -- -- 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 --- You received this message because you are subscribed to the Google Groups "vim_use" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
