diff --git a/home/git/global.nix b/home/git/global.nix index 5ff7abe2..6b886f0c 100644 --- 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";