From b5da5ec57ff8435712621e62948822ff24e5d07d Mon Sep 17 00:00:00 2001 From: deathaxe Date: Fri, 25 Oct 2024 17:51:18 +0200 Subject: [PATCH] [Common] Move Diff3 syntax to Diff package --- {Text => Diff}/Diff3.sublime-syntax | 0 .../tests/syntax_test_conflicts.diff3 | 2 +- Diff/{ => tests}/syntax_test_diff.diff | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {Text => Diff}/Diff3.sublime-syntax (100%) rename Text/tests/syntax_test_merge_conflict => Diff/tests/syntax_test_conflicts.diff3 (99%) rename Diff/{ => tests}/syntax_test_diff.diff (100%) diff --git a/Text/Diff3.sublime-syntax b/Diff/Diff3.sublime-syntax similarity index 100% rename from Text/Diff3.sublime-syntax rename to Diff/Diff3.sublime-syntax diff --git a/Text/tests/syntax_test_merge_conflict b/Diff/tests/syntax_test_conflicts.diff3 similarity index 99% rename from Text/tests/syntax_test_merge_conflict rename to Diff/tests/syntax_test_conflicts.diff3 index c2ea813434..481f04bbad 100644 --- a/Text/tests/syntax_test_merge_conflict +++ b/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 b/Diff/tests/syntax_test_diff.diff similarity index 100% rename from Diff/syntax_test_diff.diff rename to Diff/tests/syntax_test_diff.diff