From: Niall O Broin (niall at domain linux.ie)
Date: Fri 10 Aug 2001 - 18:18:53 IST
On Fri, Aug 10, 2001 at 04:17:31PM +0100, Donncha O Caoimh wrote:
> So, I've got to merge the changes between two versions of one file.
> hmm.. diff both files, redirect output to diff.txt in my home dir, fire
> Vi up with both files and the diff file and work away..
> New way, with Vim 6:
> vimdiff file.php3 new/file.php3
> Changes are highlighted as with diff, but colour coded too. Lines that
> are the same are folded away but can be displayed again...
> PS. yeah yeah, Emacs/your favourite editor had this long ago.. Vim has
> it now :)
Emacs has had this for yonks, of course, but I don't use it very often (I
used support people who used it a lot) so I can't remember what it's called
- can anyone refresh my memory (70 femtosecond :-) ) please ?
This archive was generated by hypermail 2.1.6 : Thu 06 Feb 2003 - 13:11:34 GMT