

def test_merge(self):
    '\n        Test git.merge\n\n        # TODO: Test more than just a fast-forward merge\n        '
    ret = self.run_function('git.merge', [self.repo], rev=self.branches[1])
    self.assertTrue(('Fast-forward' in ret.splitlines()))

dataset/ETHPy150Open saltstack/salt/tests/integration/modules/git.py GitModuleTest.test_merge/original