From ba941097f68f04308acfc03a390e945a430b4065 Mon Sep 17 00:00:00 2001
From: "gcp-cherry-pick-bot[bot]"
 <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 14:18:55 -0400
Subject: [PATCH] Keymap changes for `editor::JoinLines` (cherry-pick #14136)
 (#14234)

Cherry-picked Keymap changes for `editor::JoinLines` (#14136)
---
 assets/keymaps/default-linux.json      | 2 +-
 assets/keymaps/macos/sublime_text.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 9726758f35509de262175bcd4bcdced7ea1fd781..d7fc8b4563f36236ffa0cbebb89de219991f752d 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -397,7 +397,7 @@
     "bindings": {
       "ctrl-shift-k": "editor::DeleteLine",
       "ctrl-shift-d": "editor::DuplicateLineDown",
-      "ctrl-j": "editor::JoinLines",
+      "ctrl-shift-j": "editor::JoinLines",
       "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
       "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
       "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json
index d3df97202800f263a37ebbcd49ee141d5ab3c395..40ac28a0966f1e1f855cc4526d90044e9ed579be 100644
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -27,6 +27,7 @@
       "ctrl-,": "editor::GoToPrevHunk",
       "cmd-k cmd-u": "editor::ConvertToUpperCase",
       "cmd-k cmd-l": "editor::ConvertToLowerCase",
+      "cmd-shift-j": "editor::JoinLines",
       "shift-alt-m": "markdown::OpenPreviewToTheSide",
       "ctrl-backspace": "editor::DeleteToPreviousWordStart",
       "ctrl-delete": "editor::DeleteToNextWordEnd"