* A. Khattri <[EMAIL PROTECTED]> [2005-08-07 18:51]: > On Fri, 5 Aug 2005, Mark Knecht wrote: > > > With vimdiff how do yo make the actual changes? Can you somehow > > tell it to apply certain lines from file2 to file1 or do you have to > > copy and paste by hand? > > If there are minor changes, you can directly edit the update then save, > quit and merge the update. If there are whole line that are different, you > can cut and paste between windows (vimdiff colorises too so its easy to > see what's different and what's not).
It can be even simpler use 'dp' (as Diff Put), where you want propagate the difference to the other file and do 'do' (Diff Obtain) to put change from the other file. There is much more (yeah, it's vim after all :), see :help vimdiff . -r -- gentoo-user@gentoo.org mailing list
