git-cvsimport: fix merging with remote parent branch