diffconflicts

2025-12-15 22:05:23 +00:00
parent ed651788b4
commit cb6a6f9f46
3 changed files with 20 additions and 0 deletions
--- a/profiles/neovim/mappings.nix
+++ b/profiles/neovim/mappings.nix
@@ -118,6 +118,12 @@
 			options.desc = "Visit paths (cwd)";
 		}
 		# g - git
+		{
+			mode = "n";
+			key = "<leader>gc";
+			action = ":JJDiffConflicts<CR>";
+			options.desc = "Resolve conflicts";
+		}
 		{
 			mode = "n";
 			key = "<leader>gg";