t / t5100 / msg0006on commit git-cvsimport: fix merging with remote parent branch (c36c5b8)
   1Here is a patch from A U Thor.
   2