fix merge

nicolas-grekas · nicolas-grekas · commit 881812446875 · 2018-08-03T12:58:53.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -245,6 +245,7 @@ install:
               tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty
               if [[ $PHP = ${MIN_PHP%.*} ]]; then
                   export PHP=$MIN_PHP
+                  echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"
               fi
           fi
       }

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ install:`
`245`	`245`	`tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty`
`246`	`246`	`if [[ $PHP = ${MIN_PHP%.*} ]]; then`
`247`	`247`	`export PHP=$MIN_PHP`
	`248`	`+ echo -e "1\\n0" \| xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"`
`248`	`249`	`fi`
`249`	`250`	`fi`
`250`	`251`	`}`