1
- \ SYNTAX TEST "Packages/Diff/Diff.sublime-syntax"
1
+ \ SYNTAX TEST partial-symbols "Packages/Diff/Diff.sublime-syntax"
2
2
3
3
--- Path to Original File
4
4
\^^^^^^^^^^^^^^^^^^^^^^^^ meta.diff.header.from-file meta.header.from-file.diff - source.diff.git
@@ -103,6 +103,7 @@ Plain Text
103
103
\ ^^ markup.changed.diff meta.whitespace.trailing.diff
104
104
105
105
Index: lao
106
+ \ @@@ local-definition
106
107
\^^^^^^^^^^ meta.diff.index meta.index.diff
107
108
\^^^^ meta.mapping.key.diff keyword.other.diff
108
109
\ ^ punctuation.separator.key-value.diff
@@ -340,6 +341,7 @@ Diff3 Edit Format https://www.gnu.org/software/diffutils/manual/diffutils.html#S
340
341
341
342
SVN sample https://svnbook.red-bean.com/en/1.7/svn-book.html#idm10685
342
343
Index: deleted-file
344
+ \ @@@@@@@@@@@@ local-definition
343
345
\^^^^^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff
344
346
\^^^^ meta.mapping.key.diff keyword.other.diff
345
347
\ ^ punctuation.separator.key-value.diff
@@ -364,6 +366,7 @@ Index: deleted-file
364
366
- This file will be deleted.
365
367
\^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff
366
368
Index: changed-file
369
+ \ @@@@@@@@@@@@ local-definition
367
370
\^^^^^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff
368
371
\^^^^ meta.mapping.key.diff keyword.other.diff
369
372
\ ^ punctuation.separator.key-value.diff
@@ -390,6 +393,7 @@ Property changes on: changed-file
390
393
___________________________________________________________________
391
394
\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.separator.diff punctuation.separator.block.diff
392
395
Added: propname
396
+ \ @@@@@@@@ local-definition
393
397
\^^^^^^^^^^^^^^ meta.mapping.diff meta.diff.index meta.index.diff
394
398
\^^^^ meta.mapping.key.diff keyword.other.diff
395
399
\ ^ punctuation.separator.key-value.diff
@@ -398,6 +402,7 @@ Added: propname
398
402
+ propvalue
399
403
\^^^^^^^^^ markup.inserted.diff
400
404
Index: added-file
405
+ \ @@@@@@@@@@ local-definition
401
406
===================================================================
402
407
--- added-file (revision 0)
403
408
+++ added-file (working copy)
@@ -407,6 +412,7 @@ Index: added-file
407
412
408
413
https://www.gnu.org/software/diffutils/manual/diffutils.html#Marking-Conflicts-1
409
414
<<<<<<< A
415
+ \ @ local-definition "Conflict: A"
410
416
\^^^^^^^^^ meta.block.conflict.begin.diff - meta.block meta.block - markup
411
417
\^^^^^^ punctuation.section.block.begin.diff
412
418
\ ^ - entity - punctuation
@@ -429,6 +435,7 @@ context context
429
435
\^^^^^^^^^^^^^^^ - meta.block
430
436
431
437
<<<<<<< A
438
+ \ @ local-definition "Conflict: A"
432
439
lines from A
433
440
||||||| B
434
441
\^^^^^^^^^ meta.block.conflict.separator.diff - meta.block meta.block - markup
@@ -453,12 +460,14 @@ context context
453
460
\ <- - meta.block
454
461
455
462
<<<<<<< tzu
463
+ \ @@@ local-definition "Conflict: tzu"
456
464
=======
457
465
The Way that can be told of is not the eternal Way;
458
466
The name that can be named is not the eternal name.
459
467
>>>>>>> tao
460
468
461
469
<<<<<<< lao
470
+ \ @@@ local-definition "Conflict: lao"
462
471
||||||| tzu
463
472
They both may be called deep and profound.
464
473
Deeper and more profound,
@@ -469,6 +478,7 @@ The door of all subtleties!
469
478
>>>>>>> tao
470
479
471
480
<<<<<<< lao
481
+ \ @@@ local-definition "Conflict: lao"
472
482
=======
473
483
474
484
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
@@ -477,6 +487,7 @@ The door of all subtleties!
477
487
478
488
https://www.gnu.org/software/diffutils/manual/diffutils.html#Generating-the-Merged-Output-Directly
479
489
<<<<<<< tzu
490
+ \ @@@ local-definition "Conflict: tzu"
480
491
=======
481
492
The Way that can be told of is not the eternal Way;
482
493
The name that can be named is not the eternal name.
@@ -491,6 +502,7 @@ The two are the same,
491
502
But after they are produced,
492
503
they have different names.
493
504
<<<<<<< lao
505
+ \ @@@ local-definition "Conflict: lao"
494
506
||||||| tzu
495
507
They both may be called deep and profound.
496
508
Deeper and more profound,
@@ -502,6 +514,7 @@ The door of all subtleties!
502
514
503
515
If you have questions, please
504
516
<<<<<<< HEAD
517
+ \ @@@@ local-definition "Conflict: HEAD"
505
518
open an issue
506
519
=======
507
520
ask your question in IRC.
@@ -513,6 +526,7 @@ ask your question in IRC.
513
526
514
527
def hello
515
528
<<<<<<< ours
529
+ \ @@@@ local-definition "Conflict: ours"
516
530
puts 'hola world'
517
531
||||||| base
518
532
puts 'hello world'
@@ -526,6 +540,7 @@ hello()
526
540
527
541
\ https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts
528
542
<<<<<<< HEAD:index.html
543
+ \ @@@@@@@@@@@@@@@ local-definition "Conflict: HEAD:index.html"
529
544
<div id="footer">contact :
[email protected] </div>
530
545
=======
531
546
<div id="footer">
@@ -536,6 +551,7 @@ hello()
536
551
537
552
\ https://git-scm.com/docs/rerere.html#_nested_conflicts
538
553
<<<<<<< HEAD
554
+ \ @@@@ local-definition "Conflict: HEAD"
539
555
\^^^^^^^^^^^^ meta.block.conflict.begin.diff
540
556
\^^^^^^ punctuation.section.block.begin.diff
541
557
\ ^^^^ entity.name.section.diff
@@ -545,6 +561,7 @@ hello()
545
561
\^^^^^^^ meta.block.conflict.separator.diff
546
562
\^^^^^^ punctuation.section.block.diff
547
563
<<<<<<< HEAD
564
+ \ @@@@ local-definition "Conflict: HEAD"
548
565
\^^^^^^^^^^^^ meta.block.conflict.diff markup.inserted.diff meta.block.conflict.begin.diff
549
566
\^^^^^^ punctuation.section.block.begin.diff
550
567
\ ^^^^ entity.name.section.diff
0 commit comments