From bd90df30e4ba70587aed146b1e7205962da4db78 Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Fri, 5 Sep 2025 08:48:45 +0200
Subject: [PATCH] nvim: Turn off usage message for jj-diffconflicts

---
 nvim/.config/nvim/lazy-lock.json      | 2 +-
 nvim/.config/nvim/lua/plugins/git.lua | 8 +++++++-
 vcs/jj/config/jj/config.toml          | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index cf64526..2ce5101 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -29,7 +29,7 @@
   "hunk.nvim": { "branch": "master", "commit": "1e0a4d719c780bb8b0690a54915601508ced321e" },
   "image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" },
   "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" },
-  "jj-diffconflicts": { "branch": "feat/remove-instruction-message", "commit": "ee3f9179b2ab94d5177d3935fbf2bc94258d3541" },
+  "jj-diffconflicts": { "branch": "main", "commit": "82b4a871b43c447213243e53b6d8b3c6d5729f6e" },
   "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
   "lazy-events.nvim": { "branch": "main", "commit": "63802b7ddc852bdfa29e33b158d52429276fa742" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua
index 02b59c1..efde301 100644
--- a/nvim/.config/nvim/lua/plugins/git.lua
+++ b/nvim/.config/nvim/lua/plugins/git.lua
@@ -119,5 +119,11 @@ return {
 			},
 		},
 	},
-	{ "rafikdraoui/jj-diffconflicts", lazy = false },
+	{
+		"rafikdraoui/jj-diffconflicts",
+		config = function()
+			vim.g.jj_diffconflicts_show_usage_message = false
+		end,
+		cmd = {"JJDiffConflicts"},
+	},
 }
diff --git a/vcs/jj/config/jj/config.toml b/vcs/jj/config/jj/config.toml
index 58b5e40..a627398 100644
--- a/vcs/jj/config/jj/config.toml
+++ b/vcs/jj/config/jj/config.toml
@@ -20,7 +20,6 @@ merge-editor = "dc"
 program = "nvim"
 merge-args = [
     "-c", "let g:jj_diffconflicts_marker_length=$marker_length",
-    "-c", "let g:jj_diffconflicts_turn_off_instructions=1",
     "-c", "JJDiffConflicts!", "$output", "$base", "$left", "$right"
 ]
 merge-tool-edits-conflict-markers = true