Add git support to ldmlmerge and fix bugs in ldmlmerge