From b968cfda62b78c3d63b1946679d3bf264e549dc0 Mon Sep 17 00:00:00 2001
From: Kristian Andersen Hole <kristian@hole.priv.no>
Date: Tue, 23 Jan 2024 14:03:55 +0100
Subject: [PATCH] fixup! adds no verify to merge commit

---
 package-lock.json               | 4 ++--
 package.json                    | 2 +-
 src/commands/mergingCommands.ts | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dcd93bd..631214f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "magit",
-  "version": "0.6.57",
+  "version": "0.6.59",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "magit",
-      "version": "0.6.57",
+      "version": "0.6.59",
       "license": "MIT",
       "dependencies": {
         "@vscode/iconv-lite-umd": "^0.7.0",
diff --git a/package.json b/package.json
index 08f982d..37a086c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "author": {
     "name": "Kristian Andersen Hole"
   },
-  "version": "0.6.57",
+  "version": "0.6.59",
   "engines": {
     "vscode": "^1.50.0"
   },
diff --git a/src/commands/mergingCommands.ts b/src/commands/mergingCommands.ts
index 650342a..4b17016 100644
--- a/src/commands/mergingCommands.ts
+++ b/src/commands/mergingCommands.ts
@@ -29,16 +29,16 @@ export async function merging(repository: MagitRepository) {
   const switches = [
     { key: '-f', name: '--ff-only', description: 'Fast-forward only' },
     { key: '-n', name: '--no-ff', description: 'No fast-forward' },
-    { key: '-n', name: '--no-verify', description: 'Disable hooks' },
+    { key: '-v', name: '--no-verify', description: 'Disable hooks' },
   ];
   const whileMergingSwitches = [
     { key: '-n', name: '--no-verify', description: 'Disable hooks' },
   ];
 
   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 });
   }
 }