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