Xavier Morel 65ed7c51bc [IMP] *: note to merge using mergebot in conflict message ... The message has a lot of info, but left the merging bit unwritten. Correct this issue. Fixes #765		2023-08-30 12:10:46 +02:00
..
conftest.py	[IMP] *: store filestore & forwardport checkouts in temp dirs	2022-08-05 15:35:51 +02:00
test_batches.py	[CHG] runbot_merge, forwardport: remove labelling	2020-11-20 07:41:54 +01:00
test_conflicts.py	[IMP] *: note to merge using mergebot in conflict message	2023-08-30 12:10:46 +02:00
test_limit.py	[IMP] runbot_merge, forwardport: minor cleanups	2023-08-10 13:33:16 +02:00
test_overrides.py	[IMP] forwardport: unmodified fw automatically inherit overrides	2021-01-13 16:11:14 +01:00
test_simple.py	[REF] *: move most feedback messages to pseudo-templates	2023-06-14 16:01:45 +02:00
test_updates.py	[ADD] forwardport: message on parent of detached PR	2023-08-29 15:59:05 +02:00
test_weird.py	[REF] *: move most feedback messages to pseudo-templates	2023-06-14 16:01:45 +02:00