Merge pull request #235 from daxmc99/merge-conflict

Add merge-conflict
kasecato · Oct 29, 2021 · b68d28a · b68d28a
2 parents eb638a9 + c0ed4ef
commit b68d28a
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/package-with-comment.json b/src/package-with-comment.json
@@ -1654,6 +1654,20 @@
                 "when": "textCompareEditorVisible",
                 "intellij": "Previous difference"
             },
+            {
+                "key": "f7",
+                "mac": "f7",
+                "command": "merge-conflict.next",
+                "when": "merge-conflict",
+                "intellij": "Next difference"
+            },
+            {
+                "key": "shift+f7",
+                "mac": "shift+f7",
+                "command": "merge-conflict.previous",
+                "when": "merge-conflict",
+                "intellij": "Previous difference"
+            },
             {
                 "key": "alt+ctrl+enter",
                 "mac": "alt+cmd+enter",