[arch-general] merging files from pacnew
static.vortex at gmx.com
Mon Jun 25 00:55:48 EDT 2012
On Sun, Jun 24, 2012 at 06:28:15PM +0200, Sébastien Luttringer wrote:
> On Sun, Jun 24, 2012 at 6:02 PM, Arno Gaboury <arnaud.gaboury at gmail.com> wrote:
> > Is there a simple command line I can use, appart sdiff and Vimdiff??
> if use pacdiff from pacman-contrib
AFAIK pacdiff uses vimdiff too.
If you are not comfortable with vimdiff, you can try meld. It is graphical,
More information about the arch-general