runbot/forwardport/tests
Xavier Morel fb45f089b0 [FIX] forwardport: use diff3 for conflict style
Existing conflict style is the local default ("merge", most
likely). `diff3` is a lot more informative as it provides the common
ancestor's code for the hunk, which helps see how the two branches
diverged and thus resolve the conflict.

Even better would be zdiff3 but that's a bit too recent...

Fixes #619
2022-06-30 15:07:49 +02: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 [FIX] forwardport: use diff3 for conflict style 2022-06-30 15:07:49 +02:00
test_limit.py [IMP] *: review mergebot & forwardbot messages for pinging 2022-06-30 15:07:49 +02:00
test_overrides.py [IMP] forwardport: unmodified fw automatically inherit overrides 2021-01-13 16:11:14 +01:00
test_simple.py [IMP] *: review mergebot & forwardbot messages for pinging 2022-06-30 15:07:49 +02:00
test_updates.py [FIX] forwardport: use diff3 for conflict style 2022-06-30 15:07:49 +02:00
test_weird.py [IMP] *: review mergebot & forwardbot messages for pinging 2022-06-30 15:07:49 +02:00