diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-01 04:11:35 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-01 04:11:35 +0300 |
commit | 271e44ea57e157881cf855d0365d019f64568848 (patch) | |
tree | a5b46838f67b40ee7a197fd1baa2cc9d4fedbd00 /plugins/CoreConsole | |
parent | d0e23197c77d4e7372587a624854f1ced3b87054 (diff) | |
parent | 5adb25bb00dbc409f91749dc90713b06953b86e8 (diff) |
Merge branch 'master' into log-refactoring-1
Conflicts:
core/Error.php
Diffstat (limited to 'plugins/CoreConsole')
-rw-r--r-- | plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php index 987a434d93..f80864ad43 100644 --- a/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php +++ b/plugins/CoreConsole/Commands/DevelopmentSyncUITestScreenshots.php @@ -100,13 +100,13 @@ class DevelopmentSyncUITestScreenshots extends ConsoleCommand $output->writeln("If all downloaded screenshots are valid you may push them with these commands:"); $output->writeln(''); $commands = "cd tests/PHPUnit/UI/ -git add expected-ui-screenshots/ git pull +git add expected-ui-screenshots/ git commit -m'' # WRITE A COMMIT MESSAGE git push cd .. -git add UI git pull +git add UI git commit -m'' #WRITE A COMMIT MESSAGE git push"; $output->writeln($commands); |