[phpMyAdmin Git] [phpmyadmin/scripts] 03bd80: Add git merge options to allow non interactive run

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 03bd80d67e58de3e71446af0a5560f2492c963d7 https://github.com/phpmyadmin/scripts/commit/03bd80d67e58de3e71446af0a5560f2... Author: Michal Čihař michal@cihar.com Date: 2017-07-17 (Mon, 17 Jul 2017)

Changed paths: M website/daily-composer

Log Message: ----------- Add git merge options to allow non interactive run

There might be conflicting changes (eg. README.rst on release) and we do not want to handle these manually.

Signed-off-by: Michal Čihař michal@cihar.com