From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 27 Sep 2021 17:37:18 +0000 (+0100)
Subject: whoops merge partsig
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=refs%2Fheads%2Flibresoc-merger;p=nmigen.git

whoops merge partsig
---

diff --git a/branch_merger.sh b/branch_merger.sh
index 3d1d287..c2b2a83 100755
--- a/branch_merger.sh
+++ b/branch_merger.sh
@@ -7,7 +7,7 @@ git rebase master
 
 # now rebase the "display" branch onto the "fork" branch
 git checkout libresoc-nmigen-fork
-git merge -s octopus display-patch libresoc-merger libresoc-nmigen-fork
+git merge -s octopus display-patch libresoc-merger libresoc-partsig
 
 # and back to this branch
 git checkout libresoc-merger