Xavier Morel 6d7c728471 [CHG] runbot_merge: toggle default merge method to rebase-and-merge ... After discussion with al & rco, conclusion was default PR merging method should be rebase-and-merge for cleaner history. Add test for that scenario (w/ test for final DAG) and implement this change.		2018-09-03 13:16:36 +02:00
..
__init__.py	[CHG] runbot_merge: toggle default merge method to rebase-and-merge	2018-09-03 13:16:36 +02:00
git.py	[FIX] runbot_merge: a few warnings	2018-09-03 13:16:36 +02:00