[Kbabel] Resolve conflicts

[Stanislav Visnovsky]

On Thu, 16 Jan 2003, Dwayne Bailey wrote:

> Stanislav Visnovsky wrote:
> > On Tue, 14 Jan 2003, Dwayne Bailey wrote:
> > 
> > 
> >>In the resolve conflicts entry under file commands.  On my version it 
> >>did not add the new "Resolve CVS conflicts" because it already had 
> >>entries from my previous version.
> > 
> > 
> > Sorry, I don't understand this :-(
> 
> The "Resolve CVS conflicts" entries are in the hardcoded source.
> 
> But they are only read if my kbabelrc does not contain its own commands.
> 
> Because I have entries in my kbabelrc file the resolve cvs conflicts 
> never appears and never gets added to my kbabelrc.

I see. The configuration dialog does not contain "Defaults" button. And
again, kconf_update script would be nice.

Stanislav