deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

clean up

Browse source
This commit is contained in:
ErgoZ 2013-10-09 23:12:08 +04:00
parent 1abc6aa9e0
commit 553de5e3ec
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Plugin/MergeConflicter.php
View file

@ -55,7 +55,7 @@ class MergeConflicter implements \PHPCI\Plugin
}
}
$cmd = 'echo "#############################"; echo "# Git Conflict Merge Finder #"; echo "#############################"; grep -R -E "^<<<<<<<$|^>>>>>>>$|^=======$" %s %s --line-number "%s"; test $? -ne 0 && echo "ALL OK. No merge conflicts found.";';
$cmd = 'grep -R -E "^<<<<<<<$|^>>>>>>>$|^=======$" %s %s --line-number "%s"; test $? -ne 0;';
return $this->phpci->executeCommand($cmd, $ignore_file_formats, $ignore_dirs, $this->phpci->buildPath.$this->path);
}
}