Code

git-cvsserver: fix breakage when calling git merge-file