From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.43) id 1E1GXG-0001CU-Ay for garchives@archives.gentoo.org; Sat, 06 Aug 2005 04:43:50 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.4/8.13.4) with SMTP id j764eefl000883; Sat, 6 Aug 2005 04:40:40 GMT Received: from mail.bway.net (xena.bway.net [216.220.96.26]) by robin.gentoo.org (8.13.4/8.13.4) with ESMTP id j764Wcw0011163 for ; Sat, 6 Aug 2005 04:32:39 GMT Received: (qmail 11498 invoked by uid 0); 6 Aug 2005 04:33:36 -0000 Received: from unknown (HELO ida.bway.net) (216.220.96.4) by smtp.bway.net with (EDH-RSA-DES-CBC3-SHA encrypted) SMTP; 6 Aug 2005 04:33:36 -0000 Date: Sat, 6 Aug 2005 00:31:08 -0400 (EDT) From: "A. Khattri" To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] Some intelligence in etc-update... please. In-Reply-To: <5bdc1c8b050805071517caf677@mail.gmail.com> Message-ID: References: <5bdc1c8b050805071517caf677@mail.gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Archives-Salt: 69b4d1be-fbbe-45a0-9c68-e522a1cd9f0d X-Archives-Hash: 1501121af87cfb0228b1671a0b0439fa 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). -- -- gentoo-user@gentoo.org mailing list