Xavier Morel 8c11db21a2 [FIX] forwardport: merge error message change in git ... Apparently 2.34: * flipped around the "auto-merging" and "CONFLICT" messages on stdout, so just match the second one with wildcards around to ignore the location of the first * changed the casing and content of everything after the `error` line on stderr, so just ignore it all (none of it's actually useful anyway)		2021-11-18 08:20:50 +01:00
..
conftest.py	[IMP] runbot_merge: split staging cron in two	2020-02-11 08:07:57 +01:00
test_batches.py	[CHG] runbot_merge, forwardport: remove labelling	2020-11-20 07:41:54 +01:00
test_conflicts.py	[IMP] *: add draft support to mergebot, kinda	2021-08-24 15:39:47 +02:00
test_limit.py	[FIX] fwbot: properly prevent @up to on forward-port PRs	2021-08-24 15:39:47 +02:00
test_overrides.py	[IMP] forwardport: unmodified fw automatically inherit overrides	2021-01-13 16:11:14 +01:00
test_simple.py	[FIX] forwardport: allow delegates on fw PRs to review followups	2021-10-20 14:36:50 +02:00
test_updates.py	[FIX] forwardport: merge error message change in git	2021-11-18 08:20:50 +01:00
test_weird.py	[IMP] *: add draft support to mergebot, kinda	2021-08-24 15:39:47 +02:00