How to resolve merge conflicts without GUI?

Hello,

 There are examples how to use kdiff3 to resolve conflicts. I looked at 
the file with a conflict and I did not see any CVS type comments inside. 
How can I see what was the problem? Is it possible to resolve conflicts 
with just console applications?
- Alexey.
--
------------------------------------------------------------------------
/ Alexey N. Solofnenko
home: http://trelony.cjb.net/
/