Xavier Morel 952dafa45c [IMP] forwardport: feedback on conflict ... append `git status` data to stderr, should be somewhat more informative especially when a conflict is a DU (where the file has been deleted on one side, so there is no conflict marker anywhere). Fixes #461		2021-03-02 14:28:32 +01:00
..
__init__.py	[ADD] forwardbot	2019-09-05 10:00:07 +02:00
forwardport.py	[FIX] forwardport: completely update PR data when forwarding updates	2021-03-02 14:28:32 +01:00
project.py	[IMP] forwardport: feedback on conflict	2021-03-02 14:28:32 +01:00