Jari> Here is new version that should now compile cleanly. Jari
Jari> ;;; cvs-conflict.el --- Minor mode for editing cvs conflicts
FYI: There's a problem with viper-mode and this mode. I have not yet
resolved it; the keymap is not installed properly (so the menu never
appears as well). This occurs with GNU emacsen. Jari, you may want to
put your name on there as well.
-Jim