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
..
apps	Menu Manager: Add ability to customize main and sub menu icons.	2016-05-02 14:42:06 -06:00
authentication	Update ldap.php	2016-11-02 00:16:30 -06:00
databases	Cleanup the indentation ... tabs and whitespace after the last pull request.	2016-04-28 16:56:44 -06:00
default_settings	Fax email fix for master branch (#2023)	2016-10-31 14:19:41 -06:00
domain_settings	Theme: Integrate ability to use Google Fonts.	2016-05-05 12:57:08 -06:00
events/resources/classes	\r\n --> \n	2016-04-25 20:30:23 -05:00
groups	Update groups.php	2016-11-04 23:15:12 -06:00
install	Update install_switch.php	2016-10-31 23:46:13 -06:00
menu	Update menu_item_edit.php	2016-08-05 09:16:42 -06:00
notifications	Cleanup the indentation ... tabs and whitespace after the last pull request.	2016-04-28 16:56:44 -06:00
upgrade	[master] include stderr in git pull results and check for error (#2105)	2016-11-20 13:54:57 -07:00
user_settings	Users: Revamp and consolidate code, integrate ORM.	2016-10-05 10:29:30 -06:00
users	Update user_edit.php	2016-10-18 09:23:42 -06:00