On 08/22/12 19:46, Simon Ruderich wrote: > On Wed, Aug 22, 2012 at 06:49:06PM -0500, Tim Chase wrote: >> [snip] >> which modified file do you want. I'll often instruct Vim to ignore >> the file on disk, yank the entire contents (":%y") and paste them in >> a new buffer (":vnew", "PGdd"), go back to the original file and >> force a reload of it (":e!") to get the other modified version, then >> use Vim's diffing abilities to compare the two (":diffthis" in each >> window). That allows me to have both versions and make sure I >> eventually save what I really want. > > You might be interested in the :DiffOrig command from > vimrc_example.vim which automates this task,
I'm familiar with :DiffOrig and even use it occasionally. But when something unexpected happens, I tend to prefer to do each step manually to make sure I know exactly what's happening at each point along the way to ensure that all my data is safe. -tim -- 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