On Tue, 2013-07-30 at 20:05 +0200, Lukas Jirkovsky wrote: > On 30 July 2013 16:33, Pedro Alejandro López-Valencia > <palopezv@xxxxxxxxx> wrote: > > IMnsHO, teach this person to use the tools already available: both nano, > > diffutils and less are part of base. Teach person to use "diff -u" ... > The only diff tool comparable to vimdiff that comes into my mind is > emacs diff mode. You are correct, but both vimdiff and emacs diff mode are sophisticated crutches. You should learn the basic tools to be able to understand the sophisticated ones later and make good use of them. Of course there are situations where an automated merge tool is a godsend; FreeBSD mergemaster comes to my mind: Who wants to merge a hundred+ configuration files by hand when most have changed their SCM id strings if much? And then it stops and let's you resolve by hand each real difference between files. I've never used them but I'd guess pacnew_scripts operate that way.
