Viewing all changes in revision 7676.

Committer: Breezy landing bot
Author(s): Jelmer Vernooĳ
Date: 2021-03-21 18:27:26 UTC
mfrom: <a title="Merged From 7674.2.2" href="/~jelmer/brz/gitlab-unauthorised/revision/7674.2.2">(7674.2.2 fix-gitlab-conflicts)
Revision ID: breezy.the.bot@gmail.com-20210321182726-golqnd2a5rodru5a

Fix handling of gitlab conflicts.

Merged from https://code.launchpad.net/~jelmer/brz/fix-gitlab-conflicts/+merge/399951

added added

removed removed

~jelmer/brz/gitlab-unauthorised