Searched refs:getMergeResult (Results 1 – 2 of 2) sorted by path
50 … $this->assertEquals($updated_pages['testanimal']['passed'][0]->getMergeResult(), 'new file');72 … $this->assertEquals($updated_pages['testanimal']['passed'][0]->getMergeResult(), 'unchanged');109 …$this->assertEquals($updated_pages['testanimal']['passed'][0]->getMergeResult(), 'file overwritten…133 … $this->assertEquals($updated_pages['testanimal']['passed'][0]->getMergeResult(), 'unchanged');165 …$this->assertEquals($updated_pages['testanimal']['passed'][0]->getMergeResult(), 'merged without c…191 …$this->assertEquals($updated_pages['testanimal']['failed'][0]->getMergeResult(), 'merged with conf…
57 public function getMergeResult() { function in dokuwiki\\plugin\\farmsync\\meta\\UpdateResults74 $text = $this->helper->getLang('mergeresult:' . $this->getMergeResult());