Hi, On Sun, Sep 02, 2007 at 11:55:05AM +0200, Richard Hartmann wrote: > Configuration file `/etc/sysctl.conf' > ==> Modified (by you or by a script) since installation. > ==> Package distributor has shipped an updated version. > What would you like to do about it ? Your options are: > Y or I : install the package maintainer's version > N or O : keep your currently-installed version > D : show the differences between the versions > Z : background this process to examine the situation > The default action is to keep your current version. > *** sysctl.conf (Y/I/N/O/D/Z) [default=N] ? > > What I would want is something like > > M: merge files interactively > > which would then call vimdiff, probably via $DIFF_EDITOR > or some other variable if something like it does already exist. I'd like that too. At the moment I just hit Z to suspend and then do vimdiff manually. Cheers, Andy
Attachment:
signature.asc
Description: Digital signature