Skip to content

Commit b5da5ec

Browse files
author
deathaxe
committed
[Common] Move Diff3 syntax to Diff package
1 parent fc3b713 commit b5da5ec

File tree

3 files changed

+1
-1
lines changed

3 files changed

+1
-1
lines changed
File renamed without changes.

Text/tests/syntax_test_merge_conflict renamed to Diff/tests/syntax_test_conflicts.diff3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SYNTAX TEST "Packages/Text/Diff3.sublime-syntax"
1+
# SYNTAX TEST "Packages/Diff/Diff3.sublime-syntax"
22

33
<<<<<<< HEAD
44
# <- markup.conflict.begin.diff3 punctuation.section.conflict.diff3
File renamed without changes.

0 commit comments

Comments
 (0)