Files
fusionpbx/core/upgrade/index.php
jebsolutions dd8385f63b [master] include stderr in git pull results and check for error (#2105)
* [master] include stderr in git pull results and check for error

Old result (seems correct but actually failed):
Updating d190f6a..d958bea

Corrected result (includes failure message):
Updating d190f6a..d958bea
error: Your local changes to the following files would be overwritten by merge:
app/fax/fax_log_view.php
Please, commit your changes or stash them before you can merge.

* tab fixes
2016-11-20 13:54:57 -07:00

8.7 KiB