Merge pull request #18 from ktf/master

Handle the case in which some automatic merge left unhandled files around.
Update man page of git-cms-checkdeps.