Use smerge path

simonrw · Mar 13, 2024 · fa4d178 · fa4d178
1 parent 41e2358
commit fa4d178
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/home/git/global.nix b/home/git/global.nix
@@ -135,6 +135,10 @@
         cmd = "${pkgs.meld}/bin/meld $LOCAL $REMOTE";
       };
       mergetool = {
+        smerge = {
+          cmd = ''${pkgs.sublime-merge}/bin/smerge'';
+          keepBackup = false;
+        };
         pycharm = {
           cmd = ''pycharm-community merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"'';
           keepBackup = false;
@@ -147,10 +151,6 @@
           cmd = "nvim +Conflicted";
           keepBackup = false;
         };
-        smerge = {
-          cmd = "smerge";
-          keepBackup = false;
-        };
         prompt = false;
         vimdiff = {
           cmd = "nvim -d";