Add merge support in git.