Setup unclash.nvim

2026-08-15 18:43:42 +00:00 · 2026-03-21 23:18:55 +01:00
parent 1824f9a519
commit b0fb300dbb
4 changed files with 17 additions and 15 deletions
@@ -31,6 +31,9 @@
        "closest_bookmark(to)" = "heads(::to & bookmarks())";
        "closest_pushable(to)" = ''heads(::to & mutable() & ~description(exact:" ") & (~empty() | merges()))'';
      };
+      ui = {
+        conflict-marker-style = "git";
+      };
    };
  };
 }
@@ -69,6 +69,7 @@
      jsp = "jj split";
      jspi = "jj split -i";
      jt = "jj tug";
+      ju = "jj undo";

      # k8s
      k = "kubectl";