runbot/forwardport
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
..
changelog [ADD] mergebot, forwardbot: changelog 2021-10-20 15:16:48 +02:00
data [ADD] mergebot, forwardbot: changelog 2021-10-20 15:16:48 +02:00
migrations/13.0.1.1 [IMP] forwardport: reliability of PR reminders 2020-05-26 15:56:36 +02:00
models [ADD] runbot_merge: ~~tree~~ freeze wizard 2021-11-17 10:40:12 +01:00
tests [FIX] forwardport: merge error message change in git 2021-11-18 08:20:50 +01:00
__init__.py [ADD] mergebot, forwardbot: changelog 2021-10-20 15:16:48 +02:00
__manifest__.py [FIX] runbot: adapt routes and licenses 2021-07-27 16:11:49 +02:00
controllers.py [ADD] mergebot, forwardbot: changelog 2021-10-20 15:16:48 +02:00