|
Rich Freeman on 7 May 2013 14:01:28 -0700
|
[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]
|
Re: [PLUG] Moving user accounts
|
- From: Rich Freeman <r-plug@thefreemanclan.net>
- To: "Philadelphia Linux User's Group Discussion List" <plug@lists.phillylinux.org>
- Subject: Re: [PLUG] Moving user accounts
- Date: Tue, 7 May 2013 17:01:23 -0400
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=WCIo3MZhA382uipQUOyUomiNySVIvfrhCpDh1nFIjds=; b=tW6zfCWtbzy+qIeLlVPG3nfYP41Q/cD3vaouuAX/f8lRTTShyP1i53T71fu3YItsK8 fm6crCi9NRlh9Qa9SaNIHhDZQWImFxEkXp34si1Amc6eIG3CSLh8HC3kkS3P8u5EWWh5 AJ3zK2AdVenSea+PP5RTWHkTavG+s+UuREAa/e1312vyAAvg4kFDLE8ktJleAYzyuvX6 15crIQfe2iAgls0CNHo+EDxJX2lS1uFTHOWpO5W7qlMzua6ZphMRq5FQtK2zOYjahJoi mtlBC/UsN/bnk7ZFQcW/EJxWHP/flYASAGVchokjPhibYuLuGiS0HNmJjpay/j5CJz+s 6pNw==
- Reply-to: Philadelphia Linux User's Group Discussion List <plug@lists.phillylinux.org>
- Sender: plug-bounces@lists.phillylinux.org
On Tue, May 7, 2013 at 4:58 PM, JP Vossen <jp@jpsdomain.org> wrote:
> I'd personally use the awesome 'meld' GUI diff/merge tool, but you can use
> 'vi' or whatever you are comfortable with too.
++ on meld. I use it all the time for config file management (merging
changes to files in /etc from packages). It supports 2- and 3-way
diffing.
Rich
___________________________________________________________________________
Philadelphia Linux Users Group -- http://www.phillylinux.org
Announcements - http://lists.phillylinux.org/mailman/listinfo/plug-announce
General Discussion -- http://lists.phillylinux.org/mailman/listinfo/plug