Commit d2f034621e6 by Georges Racinet

Test detection of conflicting merge request

This works right away, has been written while investigating
heptapod#131 and heptapod#99
parent 219e401d2a0
Pipeline #1443 passed with stage
in 13 seconds