[Kbabel] Resolve conflicts

[Dwayne Bailey]

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.

-- 
Kind regards
Dwayne Bailey

Obsidian Systems
dwayne@obsidian.co.za     +27-21-448 9265 / 7827 (work)
+27-21-448 9574 (fax)     +27-83-443 7114 (cell)

"An English-only, or even an English-mainly, policy necessarily condemns
most people, and thus the country as a whole, to a permanent state of
mediocrity, since people are unable to be spontaneous, creative and
self-confident if they cannot use their first language"
          Dr Neville Alexander - 'Where English can Serve but not Empower.'