Reduce complexity of GitRepository.rmerge()