[PATCH] Add merge detection to git-cvsimport