[Common] Move Diff3 syntax to Diff package

sublimehq · Oct 25, 2024 · b5da5ec · b5da5ec
1 parent fc3b713
commit b5da5ec
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/Text/Diff3.sublime-syntax → Diff/Diff3.sublime-syntax b/Text/Diff3.sublime-syntax → Diff/Diff3.sublime-syntax
diff --git a/Text/tests/syntax_test_merge_conflict → Diff/tests/syntax_test_conflicts.diff3 b/Text/tests/syntax_test_merge_conflict → Diff/tests/syntax_test_conflicts.diff3
@@ -1,4 +1,4 @@
-# SYNTAX TEST "Packages/Text/Diff3.sublime-syntax"
+# SYNTAX TEST "Packages/Diff/Diff3.sublime-syntax"
 
 <<<<<<< HEAD
 #  <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3

diff --git a/Diff/syntax_test_diff.diff → Diff/tests/syntax_test_diff.diff b/Diff/syntax_test_diff.diff → Diff/tests/syntax_test_diff.diff