Hello,

I checked the interactive conflict resolver of SVK, and I think something similar would
be very usefull when users tries to resolve the conflict between theirs versions and
packages versions of config files.

For example:
Configuration file /etc/default/nfs-kernel-server'
 ==> 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.
*** nfs-kernel-server (Y/I/N/O/D/Z) [default=N] ?

It would be very nice if this list contains some other options:
-edit file
-merge

edit file option starts a $EDITOR and
merge starts a merger like SVK does it.

You can check svk: svk.elixus.org.

Merge editor in SVK checks for available merge tools, and if one of them found then starts it.

I'm not sure but maybe it is possible to call directly from SVK this resolver logic.

Hello,

Good morning,

We have gone through your samples from a partner and Here is our  Order
List. Please do bear in mind that we are very much in  need of this
order, quote your competitive prices.

Kindly send the Order confirmation.

Your early reply will be much appreciated.

Best Regards,

Maryanah Erwin.

PT FINDORA INTERNUSA

Jln Pahlawan 66 Kec. Arjawinangun

45162 CIREBON West-Java INDONESIA

tel : +62 231 357334

fax: +62 231 357260

email: marketing@findora.com