Searched refs:setMergeResult (Results 1 – 5 of 5) sorted by relevance
15 $result->setMergeResult('new file');22 $result->setMergeResult('unchanged');30 $result->setMergeResult('file overwritten');45 $result->setMergeResult('unchanged');52 $result->setMergeResult('merged without conflicts');57 $result->setMergeResult('merged with conflicts');
15 $result->setMergeResult('new file');21 $result->setMergeResult('unchanged');27 $result->setMergeResult('file overwritten');32 $result->setMergeResult('unchanged');37 $result->setMergeResult('merged with conflicts');
17 $result->setMergeResult('new file');23 $result->setMergeResult('unchanged');29 $result->setMergeResult('file overwritten');34 $result->setMergeResult('merged with conflicts');
64 public function setMergeResult($mergeResult) { function in dokuwiki\\plugin\\farmsync\\meta\\UpdateResults
483 $result->setMergeResult('new file');490 $result->setMergeResult('unchanged');494 $result->setMergeResult('file overwritten');498 $result->setMergeResult('merged with conflicts');