fixup! adds no verify to merge commit

kahole · Jan 23, 2024 · ee7f339 · ee7f339
1 parent 7c9edfe
commit ee7f339
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "author": {
     "name": "Kristian Andersen Hole"
   },
-  "version": "0.6.57",
+  "version": "0.6.58",
   "engines": {
     "vscode": "^1.50.0"
   },

diff --git a/src/commands/mergingCommands.ts b/src/commands/mergingCommands.ts
@@ -36,9 +36,9 @@ export async function merging(repository: MagitRepository) {
   ];
 
   if (repository.mergingState) {
-    return MenuUtil.showMenu(whileMergingMenu, { repository, switches });
+    return MenuUtil.showMenu(whileMergingMenu, { repository, switches: whileMergingSwitches });
   } else {
-    return MenuUtil.showMenu(mergingMenu, { repository, switches: whileMergingSwitches });
+    return MenuUtil.showMenu(mergingMenu, { repository, switches });
   }
 }