merging code from mercurial code base to git code base