]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28427a6 0fd1c1d)
Merge commit '0fd1c1d0' into thread-next
authorMaria Matejka <mq@ucw.cz>
Tue, 20 Sep 2022 07:52:03 +0000 (09:52 +0200)
committerMaria Matejka <mq@ucw.cz>
Tue, 20 Sep 2022 07:52:03 +0000 (09:52 +0200)
Using the "ours" strategy as the changes introduced in merged commits
are already implemented in thread-next in a different way.


Trivial merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git