add libresoc-nmigen-fork octopus

diff --git a/branch_merger.sh b/branch_merger.sh
old mode 100755 (executable)
new mode 100644 (file)
index d01fb17..3d1d287
--- a/branch_merger.sh
+++ b/branch_merger.sh
@@ -7,4 +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
+git merge -s octopus display-patch libresoc-merger libresoc-nmigen-fork
+
+# and back to this branch
+git checkout libresoc-merger