/**
* @covers ::log
* @covers ::getLogs
* @covers ::merge
* @depends testEditingFiles
*/
public function testMerging()
{
$branches = $this->branchesProvider();
self::$git->checkout($branches[0][0]);
self::$git->add('.');
self::$git->commit($message = 'Some changes.');
$this->assertContains($message, self::$git->log());
$counter = count(self::$git->getLogs());
self::$git->checkout('master');
self::$git->merge($branches[0][0]);
self::$git->commit($mergeMessage = 'Merging');
$this->assertContains($message, self::$git->log());
$this->assertContains($mergeMessage, self::$git->log());
$this->assertCount(++$counter, self::$git->getLogs());
}
