def test_merge(self):
        # Merge the second branch into the current branch
        ret = self.run_function(
            'git.merge',
            [self.repo],
            rev=self.branches[1]
        )
        # Merge should be a fast-forward
        self.assertTrue('Fast-forward' in ret.splitlines())
Ajax Tooltips
dataset/ETHPy150Open saltstack/salt/tests/integration/modules/git.py/GitModuleTest.test_merge--crossover with--dataset/ETHPy150Open sahana/eden/controllers/dvi.py/tooltip