Improve interface between GitRepository and Merge