]> git.ipfire.org Git - thirdparty/bird.git/commit
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)
commit5d7b2676a1e64b624c3996d1148b2f43d0c19995
tree874b81f35a54974ca79479e124f12fa04d143592
parent28427a68c32d5684652dd22400a9143722294886
parent0fd1c1d091ee8e43eb0e15c67a92960ca581ed5f
Merge commit '0fd1c1d0' into thread-next

Using the "ours" strategy as the changes introduced in merged commits
are already implemented in thread-next in a different way.