Xavier Morel cc9f239261 [IMP] forwardport: use ORT and zdiff3 for cherrypicks ... - zdiff3 should provide better conflict annotations than diff3 - ORT might also provide less conflicts period - always perform cherrypicks without rename limit, since we're re-trying every failure without rename limit, it seems like unnecessary work, assuming git only ever looks as far as it needs - also enable copy support maybe... Fixes #827		2024-06-04 14:21:15 +02:00
..
__init__.py	[ADD] runbot_merge: ~~tree~~ freeze wizard	2021-11-17 10:40:12 +01:00
forwardport.py	[IMP] *: handle the addition of a new PR to a fw-ported batch	2024-05-29 07:55:07 +02:00
project_freeze.py	[FIX] runbot_merge: sync PR target and message on check	2023-01-25 12:25:45 +01:00
project.py	[IMP] forwardport: use ORT and zdiff3 for cherrypicks	2024-06-04 14:21:15 +02:00