On Tue, Jul 30, 2013 at 5:40 AM, phanisvara <listmail@xxxxxxxxxxxxxx> wrote: > On Tuesday 30 Jul 2013 10:31:03 Paul Gideon Dann wrote: >> > nano, or mc with it's in-built editor. >> >> They don't have a diffing/merging mode, do they? > > no; i thought for somebody not used to managing arch, it would be > better to do things manually, or not at all. > > often you can leave .pacnew files alone w/o anything bad happening. > otherwise, before merging, it's better to read thru' the files and > understand what's happening, was my idea. > > -- > phani. You'll still be manually merging the files with a merging tool, it will just give you context and an up-to-date delta as you go.
