GIT_MERGE_AUTOEDIT=no git cvsimport -o master -v -k -m -d :pserver:anoncvs:anoncvs@mirror.planetunix.net:/cvs xenocara/app/cwm