-
Georges Racinet authored
This time, we'll commit the simple merge resolution before it passes the tests. The reason is that `lib/gitlab/hg_access.rb` needs to be patched and this will maybe have to be backported (even partially) to the merge with v11.2.0.pre. Therefore we want subsequent changes to be really visible.
cf4530676fc1