Hello list meld is the only merge tool I can work with, I configured meld in dispatch-conf.conf like that : diff="meld '%s' '%s'" it works and after a merge i am back in dispatch-conf screen,
>> (1 of 1) -- /etc/inittab >> q quit, h help, n next, e edit-new, z zap-new, u use-new m merge, t toggle-merge, l look-merge: I press q to quite. and another dispatch-conf run is doing this: RCS file: /var/db/dispatch-conf/config-archive/etc/inittab,v 1.1 locked done /var/db/dispatch-conf/config-archive/etc/inittab,v <-- /var/db/dispatch-conf/config-archive/etc/inittab new revision: 1.2; previous revision: 1.1 done /var/db/dispatch-conf/config-archive/etc/inittab,v --> /var/db/dispatch-conf/config-archive/etc/inittab co: /var/db/dispatch-conf/config-archive/etc/inittab,v: no side branches present for 1.1 /var/db/dispatch-conf/config-archive/etc/inittab,v <-- /var/db/dispatch-conf/config-archive/etc/inittab new revision: 1.1.1.1; previous revision: 1.1 done My question is if that is ok? is the second dispatch-conf a must? Thank you.
