[FIX] forwardport: git conflict markers

2.29 changed the formatting of conflict labels (the stuff added at the
end of the closing conflict marker):
6cceea19eb

Used to be

    >>>>>>> <commit>... <text>

now is

    >>>>>>> <commit> (<text>)

Just ignore everything after the commit hash.

forwardport/tests/test_simple.py

@@ -359,7 +359,7 @@ More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
 a
 =======
 0
->>>\x3e>>> [0-9a-f]{7,}(...)? temp
+>>>\x3e>>> [0-9a-f]{7,}.*
 '''),
     }
     [project] = env['runbot_merge.project'].search([])
@@ -538,7 +538,7 @@ def test_conflict(env, config, make_repo, users):
 a
 =======
 xxx
->>>\x3e>>> [0-9a-f]{7,}(...)? temp
+>>>\x3e>>> [0-9a-f]{7,}.*
 '''),
     }
     assert prod.get_pr(prb_id.number).comments == [