diff --git a/docs/tree-sitter-gitcommit.wasm b/docs/tree-sitter-gitcommit.wasm
index aefc8df..041efe3 100755
Binary files a/docs/tree-sitter-gitcommit.wasm and b/docs/tree-sitter-gitcommit.wasm differ
diff --git a/grammar.js b/grammar.js
index 6ac11e9..db9c127 100644
--- a/grammar.js
+++ b/grammar.js
@@ -14,18 +14,19 @@
 const WHITE_SPACE = /[\t\f\v ]+/;
 const NEWLINE = /\r?\n/;
 const ANYTHING = /[^\n\r]+/;
+const CHANGE = choice("new file", "modified", "renamed", "deleted");
 const PREC = {
   NONSENSE: -1,
   PATH: 5,
   PATH_SEPARATOR_ARROW: 6,
-  CHANGE: 8,
   ITEM: 10,
   USER: 11,
   SUBJECT_FIRST_CHAR: 15,
   SUBJECT: 16,
 };
 
-const CHANGE = choice("new file", "modified", "renamed", "deleted");
+const SCISSORS =
+  /# -+ >8 -+\n# Do not modify or remove the line above.\n# Everything below it will be ignored./;
 
 module.exports = grammar({
   name: "gitcommit",
@@ -34,21 +35,9 @@ module.exports = grammar({
 
   rules: {
     source: ($) =>
-      choice(
-        prec(
-          PREC.SUBJECT,
-          seq(
-            $.subject,
-            NEWLINE,
-            optional(seq(optional(NEWLINE), repeat($._body_line)))
-          )
-        ),
-        seq(
-          optional(choice($.comment, $.message)),
-          NEWLINE,
-          repeat($._body_line)
-        ),
-        choice($.comment, $.subject)
+      seq(
+        optional(choice($.comment, $.subject)),
+        optional(seq(NEWLINE, repeat($._body_line)))
       ),
 
     _body_line: ($) =>
@@ -61,12 +50,15 @@ module.exports = grammar({
       ),
 
     message: ($) =>
-      seq(
-        choice($.user, /[^#\s]+/),
-        optional(repeat(choice($.user, $.item, $._word)))
+      choice(
+        seq(
+          choice($.user, /[^#\s]+/),
+          optional(repeat(choice($.user, $.item, $._word)))
+        )
       ),
 
-    comment: ($) => seq("#", optional($._comment_body)),
+    comment: ($) =>
+      choice(alias(SCISSORS, $.scissors), seq("#", optional($._comment_body))),
 
     _comment_body: ($) =>
       choice(
@@ -147,7 +139,7 @@ module.exports = grammar({
     change: ($) =>
       seq(
         field("kind", CHANGE),
-        token(prec(PREC.CHANGE, ":")),
+        ":",
         $.path,
         optional(seq(token(prec(PREC.PATH_SEPARATOR_ARROW, "->")), $.path))
       ),
@@ -159,7 +151,7 @@ module.exports = grammar({
 
     path: ($) => repeat1(token(prec(PREC.PATH, /\S+/))),
 
-    user: ($) => token(prec(PREC.USER, /@\S+/)),
+    user: ($) => token(prec(PREC.USER, /@[^\s@]+/)),
     item: ($) => token(prec(PREC.ITEM, /#\d+/)),
   },
 });
diff --git a/src/grammar.json b/src/grammar.json
index dc11a77..c139b73 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -2,91 +2,26 @@
   "name": "gitcommit",
   "rules": {
     "source": {
-      "type": "CHOICE",
+      "type": "SEQ",
       "members": [
         {
-          "type": "PREC",
-          "value": 16,
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "subject"
-              },
-              {
-                "type": "PATTERN",
-                "value": "\\r?\\n"
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "CHOICE",
-                        "members": [
-                          {
-                            "type": "PATTERN",
-                            "value": "\\r?\\n"
-                          },
-                          {
-                            "type": "BLANK"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "REPEAT",
-                        "content": {
-                          "type": "SYMBOL",
-                          "name": "_body_line"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              }
-            ]
-          }
-        },
-        {
-          "type": "SEQ",
+          "type": "CHOICE",
           "members": [
             {
               "type": "CHOICE",
               "members": [
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "comment"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "message"
-                    }
-                  ]
+                  "type": "SYMBOL",
+                  "name": "comment"
                 },
                 {
-                  "type": "BLANK"
+                  "type": "SYMBOL",
+                  "name": "subject"
                 }
               ]
             },
             {
-              "type": "PATTERN",
-              "value": "\\r?\\n"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_body_line"
-              }
+              "type": "BLANK"
             }
           ]
         },
@@ -94,12 +29,23 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "comment"
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "PATTERN",
+                  "value": "\\r?\\n"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_body_line"
+                  }
+                }
+              ]
             },
             {
-              "type": "SYMBOL",
-              "name": "subject"
+              "type": "BLANK"
             }
           ]
         }
@@ -172,67 +118,86 @@
       ]
     },
     "message": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "user"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "user"
+                },
+                {
+                  "type": "PATTERN",
+                  "value": "[^#\\s]+"
+                }
+              ]
             },
             {
-              "type": "PATTERN",
-              "value": "[^#\\s]+"
-            }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "user"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "item"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "_word"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "user"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "item"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_word"
+                      }
+                    ]
                   }
-                ]
-              }
-            },
-            {
-              "type": "BLANK"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         }
       ]
     },
     "comment": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "STRING",
-          "value": "#"
+          "type": "ALIAS",
+          "content": {
+            "type": "PATTERN",
+            "value": "# -+ >8 -+\\n# Do not modify or remove the line above.\\n# Everything below it will be ignored."
+          },
+          "named": true,
+          "value": "scissors"
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "_comment_body"
+              "type": "STRING",
+              "value": "#"
             },
             {
-              "type": "BLANK"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_comment_body"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         }
@@ -630,44 +595,33 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "PREC",
-          "value": 20,
+          "type": "FIELD",
+          "name": "kind",
           "content": {
-            "type": "FIELD",
-            "name": "kind",
-            "content": {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "new file"
-                },
-                {
-                  "type": "STRING",
-                  "value": "modified"
-                },
-                {
-                  "type": "STRING",
-                  "value": "renamed"
-                },
-                {
-                  "type": "STRING",
-                  "value": "deleted"
-                }
-              ]
-            }
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "new file"
+              },
+              {
+                "type": "STRING",
+                "value": "modified"
+              },
+              {
+                "type": "STRING",
+                "value": "renamed"
+              },
+              {
+                "type": "STRING",
+                "value": "deleted"
+              }
+            ]
           }
         },
         {
-          "type": "TOKEN",
-          "content": {
-            "type": "PREC",
-            "value": 8,
-            "content": {
-              "type": "STRING",
-              "value": ":"
-            }
-          }
+          "type": "STRING",
+          "value": ":"
         },
         {
           "type": "SYMBOL",
@@ -743,7 +697,7 @@
         "value": 11,
         "content": {
           "type": "PATTERN",
-          "value": "@\\S+"
+          "value": "@[^\\s@]+"
         }
       }
     },
diff --git a/src/node-types.json b/src/node-types.json
index 2af5c7e..b2ca65d 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -53,6 +53,10 @@
           "type": "commit",
           "named": true
         },
+        {
+          "type": "scissors",
+          "named": true
+        },
         {
           "type": "summary",
           "named": true
@@ -284,6 +288,10 @@
     "type": "renamed",
     "named": false
   },
+  {
+    "type": "scissors",
+    "named": true
+  },
   {
     "type": "to",
     "named": false
diff --git a/src/parser.c b/src/parser.c
index 1875e0c..d489338 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -5,8 +5,16 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
+#ifdef _MSC_VER
+#pragma optimize("", off)
+#elif defined(__clang__)
+#pragma clang optimize off
+#elif defined(__GNUC__)
+#pragma GCC optimize ("O0")
+#endif
+
 #define LANGUAGE_VERSION 13
-#define STATE_COUNT 104
+#define STATE_COUNT 99
 #define LARGE_STATE_COUNT 2
 #define SYMBOL_COUNT 69
 #define ALIAS_COUNT 0
@@ -21,44 +29,44 @@ enum {
   aux_sym_subject_token1 = 2,
   aux_sym_subject_token2 = 3,
   aux_sym_message_token1 = 4,
-  anon_sym_POUND = 5,
-  anon_sym_Changes = 6,
-  anon_sym_to = 7,
-  anon_sym_be = 8,
-  anon_sym_committed = 9,
-  anon_sym_COLON = 10,
-  anon_sym_On = 11,
-  anon_sym_branch = 12,
-  anon_sym_Your = 13,
-  anon_sym_is = 14,
-  anon_sym_up = 15,
-  anon_sym_date = 16,
-  anon_sym_with = 17,
-  anon_sym_SQUOTE = 18,
-  anon_sym_SQUOTE_DOT = 19,
-  anon_sym_ahead = 20,
-  anon_sym_behind = 21,
-  anon_sym_of = 22,
-  anon_sym_by = 23,
-  aux_sym__branch_declaration_token1 = 24,
-  aux_sym__branch_declaration_token2 = 25,
-  anon_sym_DOT = 26,
-  anon_sym_You = 27,
-  anon_sym_are = 28,
-  anon_sym_currently = 29,
-  anon_sym_rebasing = 30,
-  anon_sym_on = 31,
-  anon_sym_HEAD = 32,
-  anon_sym_detached = 33,
-  anon_sym_at = 34,
-  anon_sym_Conflicts = 35,
-  anon_sym_Untracked = 36,
-  anon_sym_files = 37,
-  anon_sym_newfile = 38,
-  anon_sym_modified = 39,
-  anon_sym_renamed = 40,
-  anon_sym_deleted = 41,
-  anon_sym_COLON2 = 42,
+  aux_sym_comment_token1 = 5,
+  anon_sym_POUND = 6,
+  anon_sym_Changes = 7,
+  anon_sym_to = 8,
+  anon_sym_be = 9,
+  anon_sym_committed = 10,
+  anon_sym_COLON = 11,
+  anon_sym_On = 12,
+  anon_sym_branch = 13,
+  anon_sym_Your = 14,
+  anon_sym_is = 15,
+  anon_sym_up = 16,
+  anon_sym_date = 17,
+  anon_sym_with = 18,
+  anon_sym_SQUOTE = 19,
+  anon_sym_SQUOTE_DOT = 20,
+  anon_sym_ahead = 21,
+  anon_sym_behind = 22,
+  anon_sym_of = 23,
+  anon_sym_by = 24,
+  aux_sym__branch_declaration_token1 = 25,
+  aux_sym__branch_declaration_token2 = 26,
+  anon_sym_DOT = 27,
+  anon_sym_You = 28,
+  anon_sym_are = 29,
+  anon_sym_currently = 30,
+  anon_sym_rebasing = 31,
+  anon_sym_on = 32,
+  anon_sym_HEAD = 33,
+  anon_sym_detached = 34,
+  anon_sym_at = 35,
+  anon_sym_Conflicts = 36,
+  anon_sym_Untracked = 37,
+  anon_sym_files = 38,
+  anon_sym_newfile = 39,
+  anon_sym_modified = 40,
+  anon_sym_renamed = 41,
+  anon_sym_deleted = 42,
   anon_sym_DASH_GT = 43,
   sym_commit = 44,
   sym__word = 45,
@@ -93,6 +101,7 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_subject_token1] = "subject_token1",
   [aux_sym_subject_token2] = "subject_token2",
   [aux_sym_message_token1] = "message_token1",
+  [aux_sym_comment_token1] = "scissors",
   [anon_sym_POUND] = "#",
   [anon_sym_Changes] = "Changes",
   [anon_sym_to] = "to",
@@ -130,7 +139,6 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_modified] = "modified",
   [anon_sym_renamed] = "renamed",
   [anon_sym_deleted] = "deleted",
-  [anon_sym_COLON2] = ":",
   [anon_sym_DASH_GT] = "->",
   [sym_commit] = "commit",
   [sym__word] = "_word",
@@ -165,6 +173,7 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_subject_token1] = aux_sym_subject_token1,
   [aux_sym_subject_token2] = aux_sym_subject_token2,
   [aux_sym_message_token1] = aux_sym_message_token1,
+  [aux_sym_comment_token1] = aux_sym_comment_token1,
   [anon_sym_POUND] = anon_sym_POUND,
   [anon_sym_Changes] = anon_sym_Changes,
   [anon_sym_to] = anon_sym_to,
@@ -202,7 +211,6 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_modified] = anon_sym_modified,
   [anon_sym_renamed] = anon_sym_renamed,
   [anon_sym_deleted] = anon_sym_deleted,
-  [anon_sym_COLON2] = anon_sym_COLON,
   [anon_sym_DASH_GT] = anon_sym_DASH_GT,
   [sym_commit] = sym_commit,
   [sym__word] = sym__word,
@@ -252,6 +260,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
+  [aux_sym_comment_token1] = {
+    .visible = true,
+    .named = true,
+  },
   [anon_sym_POUND] = {
     .visible = true,
     .named = false,
@@ -400,10 +412,6 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_COLON2] = {
-    .visible = true,
-    .named = false,
-  },
   [anon_sym_DASH_GT] = {
     .visible = true,
     .named = false,
@@ -544,1289 +552,1558 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
   eof = lexer->eof(lexer);
   switch (state) {
     case 0:
-      if (eof) ADVANCE(143);
-      if (lookahead == '\n') ADVANCE(144);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '#') ADVANCE(152);
-      if (lookahead == '\'') ADVANCE(166);
-      if (lookahead == '-') ADVANCE(11);
-      if (lookahead == '.') ADVANCE(176);
-      if (lookahead == ':') ADVANCE(192);
-      if (lookahead == '@') ADVANCE(137);
-      if (lookahead == 'C') ADVANCE(62);
-      if (lookahead == 'H') ADVANCE(14);
-      if (lookahead == 'O') ADVANCE(93);
-      if (lookahead == 'U') ADVANCE(94);
-      if (lookahead == 'Y') ADVANCE(101);
-      if (lookahead == 'a') ADVANCE(66);
-      if (lookahead == 'b') ADVANCE(37);
-      if (lookahead == 'c') ADVANCE(102);
-      if (lookahead == 'd') ADVANCE(15);
-      if (lookahead == 'f') ADVANCE(69);
-      if (lookahead == 'i') ADVANCE(111);
-      if (lookahead == 'm') ADVANCE(103);
-      if (lookahead == 'n') ADVANCE(38);
-      if (lookahead == 'o') ADVANCE(56);
-      if (lookahead == 'r') ADVANCE(39);
-      if (lookahead == 't') ADVANCE(104);
-      if (lookahead == 'u') ADVANCE(107);
-      if (lookahead == 'w') ADVANCE(71);
+      if (lookahead == '#') ADVANCE(241);
+      if (lookahead == '\'') ADVANCE(255);
+      if (lookahead == '-') ADVANCE(31);
+      if (lookahead == '.') ADVANCE(265);
+      if (lookahead == ':') ADVANCE(247);
+      if (lookahead == '@') ADVANCE(220);
+      if (lookahead == 'C') ADVANCE(104);
+      if (lookahead == 'H') ADVANCE(36);
+      if (lookahead == 'O') ADVANCE(149);
+      if (lookahead == 'U') ADVANCE(150);
+      if (lookahead == 'Y') ADVANCE(161);
+      if (lookahead == 'a') ADVANCE(108);
+      if (lookahead == 'b') ADVANCE(67);
+      if (lookahead == 'c') ADVANCE(162);
+      if (lookahead == 'd') ADVANCE(39);
+      if (lookahead == 'f') ADVANCE(113);
+      if (lookahead == 'i') ADVANCE(183);
+      if (lookahead == 'm') ADVANCE(163);
+      if (lookahead == 'n') ADVANCE(68);
+      if (lookahead == 'o') ADVANCE(95);
+      if (lookahead == 'r') ADVANCE(69);
+      if (lookahead == 't') ADVANCE(164);
+      if (lookahead == 'u') ADVANCE(175);
+      if (lookahead == 'w') ADVANCE(115);
       if (('\t' <= lookahead && lookahead <= '\f') ||
           lookahead == ' ') SKIP(0)
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(172);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(261);
       END_STATE();
     case 1:
-      if (lookahead == '\n') ADVANCE(144);
+      if (lookahead == '\n') ADVANCE(231);
       END_STATE();
     case 2:
-      if (lookahead == '\n') ADVANCE(144);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '#') ADVANCE(152);
-      if (lookahead == '@') ADVANCE(145);
+      if (lookahead == '#') ADVANCE(348);
+      if (lookahead == '@') ADVANCE(319);
       if (lookahead == '\t' ||
-          lookahead == ' ') ADVANCE(146);
+          lookahead == ' ') SKIP(2)
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(146);
-      if (lookahead != 0) ADVANCE(145);
+          lookahead == '\f') ADVANCE(316);
+      if (lookahead != 0) ADVANCE(349);
       END_STATE();
     case 3:
-      if (lookahead == '\n') ADVANCE(144);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '#') ADVANCE(259);
-      if (lookahead == '@') ADVANCE(260);
+      if (lookahead == '-') ADVANCE(353);
       if (lookahead == '\t' ||
           lookahead == ' ') SKIP(3)
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(228);
-      if (lookahead != 0) ADVANCE(261);
+          lookahead == '\f') ADVANCE(352);
+      if (lookahead != 0) ADVANCE(355);
       END_STATE();
     case 4:
-      if (lookahead == '\n') ADVANCE(144);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '-') ADVANCE(265);
+      if (lookahead == 'C') ADVANCE(332);
+      if (lookahead == 'H') ADVANCE(322);
+      if (lookahead == 'O') ADVANCE(336);
+      if (lookahead == 'U') ADVANCE(337);
+      if (lookahead == 'Y') ADVANCE(340);
       if (lookahead == '\t' ||
           lookahead == ' ') SKIP(4)
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(264);
-      if (lookahead != 0) ADVANCE(267);
+          lookahead == '\f') ADVANCE(317);
+      if (lookahead != 0) ADVANCE(349);
       END_STATE();
     case 5:
-      if (lookahead == '\n') ADVANCE(144);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == 'C') ADVANCE(243);
-      if (lookahead == 'H') ADVANCE(233);
-      if (lookahead == 'O') ADVANCE(247);
-      if (lookahead == 'U') ADVANCE(248);
-      if (lookahead == 'Y') ADVANCE(251);
       if (lookahead == '\t' ||
           lookahead == ' ') SKIP(5)
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(229);
-      if (lookahead != 0) ADVANCE(261);
+          lookahead == '\f') ADVANCE(318);
+      if (lookahead != 0) ADVANCE(349);
       END_STATE();
     case 6:
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(6)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(230);
-      if (lookahead != 0) ADVANCE(261);
+      if (lookahead == '\n') ADVANCE(25);
+      if (lookahead == '-') ADVANCE(6);
       END_STATE();
     case 7:
-      if (lookahead == ' ') ADVANCE(59);
+      if (lookahead == '\n') ADVANCE(26);
       END_STATE();
     case 8:
-      if (lookahead == '\'') ADVANCE(9);
-      if (lookahead == ':') ADVANCE(158);
-      if (lookahead == 'a') ADVANCE(67);
-      if (lookahead == 'b') ADVANCE(46);
-      if (lookahead == 'c') ADVANCE(105);
-      if (lookahead == 'u') ADVANCE(107);
-      if (lookahead == '\t' ||
-          lookahead == 11 ||
-          lookahead == '\f' ||
-          lookahead == ' ') SKIP(8)
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('d' <= lookahead && lookahead <= 'f')) ADVANCE(136);
+      if (lookahead == ' ') ADVANCE(32);
+      if (lookahead == '-') ADVANCE(8);
       END_STATE();
     case 9:
-      if (lookahead == '.') ADVANCE(167);
+      if (lookahead == ' ') ADVANCE(37);
       END_STATE();
     case 10:
-      if (lookahead == ':') ADVANCE(192);
-      if (lookahead == 'b') ADVANCE(43);
-      if (lookahead == 'c') ADVANCE(106);
-      if (lookahead == '\t' ||
-          lookahead == 11 ||
-          lookahead == '\f' ||
-          lookahead == ' ') SKIP(10)
+      if (lookahead == ' ') ADVANCE(28);
       END_STATE();
     case 11:
-      if (lookahead == '>') ADVANCE(193);
+      if (lookahead == ' ') ADVANCE(208);
       END_STATE();
     case 12:
-      if (lookahead == 'A') ADVANCE(13);
+      if (lookahead == ' ') ADVANCE(35);
       END_STATE();
     case 13:
-      if (lookahead == 'D') ADVANCE(182);
+      if (lookahead == ' ') ADVANCE(48);
       END_STATE();
     case 14:
-      if (lookahead == 'E') ADVANCE(12);
+      if (lookahead == ' ') ADVANCE(99);
       END_STATE();
     case 15:
-      if (lookahead == 'a') ADVANCE(122);
-      if (lookahead == 'e') ADVANCE(83);
+      if (lookahead == ' ') ADVANCE(143);
       END_STATE();
     case 16:
-      if (lookahead == 'a') ADVANCE(28);
+      if (lookahead == ' ') ADVANCE(166);
       END_STATE();
     case 17:
-      if (lookahead == 'a') ADVANCE(24);
+      if (lookahead == ' ') ADVANCE(38);
       END_STATE();
     case 18:
-      if (lookahead == 'a') ADVANCE(115);
+      if (lookahead == ' ') ADVANCE(119);
       END_STATE();
     case 19:
-      if (lookahead == 'a') ADVANCE(87);
+      if (lookahead == ' ') ADVANCE(200);
       END_STATE();
     case 20:
-      if (lookahead == 'a') ADVANCE(96);
+      if (lookahead == ' ') ADVANCE(157);
       END_STATE();
     case 21:
-      if (lookahead == 'a') ADVANCE(97);
+      if (lookahead == ' ') ADVANCE(139);
       END_STATE();
     case 22:
-      if (lookahead == 'a') ADVANCE(26);
+      if (lookahead == ' ') ADVANCE(49);
       END_STATE();
     case 23:
-      if (lookahead == 'b') ADVANCE(18);
-      if (lookahead == 'n') ADVANCE(19);
+      if (lookahead == ' ') ADVANCE(181);
       END_STATE();
     case 24:
-      if (lookahead == 'c') ADVANCE(80);
+      if (lookahead == ' ') ADVANCE(124);
       END_STATE();
     case 25:
-      if (lookahead == 'c') ADVANCE(64);
+      if (lookahead == '#') ADVANCE(12);
       END_STATE();
     case 26:
-      if (lookahead == 'c') ADVANCE(68);
+      if (lookahead == '#') ADVANCE(9);
       END_STATE();
     case 27:
-      if (lookahead == 'c') ADVANCE(121);
+      if (lookahead == '-') ADVANCE(8);
       END_STATE();
     case 28:
-      if (lookahead == 'd') ADVANCE(168);
+      if (lookahead == '-') ADVANCE(6);
       END_STATE();
     case 29:
-      if (lookahead == 'd') ADVANCE(169);
+      if (lookahead == '.') ADVANCE(256);
       END_STATE();
     case 30:
-      if (lookahead == 'd') ADVANCE(191);
+      if (lookahead == '8') ADVANCE(10);
       END_STATE();
     case 31:
-      if (lookahead == 'd') ADVANCE(190);
+      if (lookahead == '>') ADVANCE(281);
       END_STATE();
     case 32:
-      if (lookahead == 'd') ADVANCE(183);
+      if (lookahead == '>') ADVANCE(30);
       END_STATE();
     case 33:
-      if (lookahead == 'd') ADVANCE(189);
+      if (lookahead == 'A') ADVANCE(34);
       END_STATE();
     case 34:
-      if (lookahead == 'd') ADVANCE(186);
+      if (lookahead == 'D') ADVANCE(271);
       END_STATE();
     case 35:
-      if (lookahead == 'd') ADVANCE(157);
+      if (lookahead == 'D') ADVANCE(167);
       END_STATE();
     case 36:
-      if (lookahead == 'd') ADVANCE(70);
+      if (lookahead == 'E') ADVANCE(33);
       END_STATE();
     case 37:
-      if (lookahead == 'e') ADVANCE(156);
-      if (lookahead == 'r') ADVANCE(21);
-      if (lookahead == 'y') ADVANCE(171);
+      if (lookahead == 'E') ADVANCE(205);
       END_STATE();
     case 38:
-      if (lookahead == 'e') ADVANCE(127);
+      if (lookahead == 'a') ADVANCE(51);
       END_STATE();
     case 39:
-      if (lookahead == 'e') ADVANCE(23);
+      if (lookahead == 'a') ADVANCE(195);
+      if (lookahead == 'e') ADVANCE(133);
       END_STATE();
     case 40:
-      if (lookahead == 'e') ADVANCE(178);
+      if (lookahead == 'a') ADVANCE(56);
       END_STATE();
     case 41:
-      if (lookahead == 'e') ADVANCE(164);
+      if (lookahead == 'a') ADVANCE(52);
       END_STATE();
     case 42:
-      if (lookahead == 'e') ADVANCE(188);
+      if (lookahead == 'a') ADVANCE(187);
       END_STATE();
     case 43:
-      if (lookahead == 'e') ADVANCE(155);
+      if (lookahead == 'a') ADVANCE(142);
       END_STATE();
     case 44:
-      if (lookahead == 'e') ADVANCE(112);
+      if (lookahead == 'a') ADVANCE(152);
       END_STATE();
     case 45:
-      if (lookahead == 'e') ADVANCE(16);
+      if (lookahead == 'a') ADVANCE(153);
       END_STATE();
     case 46:
-      if (lookahead == 'e') ADVANCE(65);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(135);
+      if (lookahead == 'a') ADVANCE(54);
       END_STATE();
     case 47:
-      if (lookahead == 'e') ADVANCE(113);
+      if (lookahead == 'b') ADVANCE(42);
+      if (lookahead == 'n') ADVANCE(43);
       END_STATE();
     case 48:
-      if (lookahead == 'e') ADVANCE(30);
+      if (lookahead == 'b') ADVANCE(79);
       END_STATE();
     case 49:
-      if (lookahead == 'e') ADVANCE(31);
+      if (lookahead == 'b') ADVANCE(93);
       END_STATE();
     case 50:
-      if (lookahead == 'e') ADVANCE(32);
+      if (lookahead == 'b') ADVANCE(74);
+      if (lookahead == 'c') ADVANCE(174);
+      if (lookahead == '\t' ||
+          lookahead == 11 ||
+          lookahead == '\f' ||
+          lookahead == ' ') SKIP(50)
       END_STATE();
     case 51:
-      if (lookahead == 'e') ADVANCE(100);
+      if (lookahead == 'b') ADVANCE(171);
       END_STATE();
     case 52:
-      if (lookahead == 'e') ADVANCE(33);
+      if (lookahead == 'c') ADVANCE(130);
       END_STATE();
     case 53:
-      if (lookahead == 'e') ADVANCE(34);
+      if (lookahead == 'c') ADVANCE(106);
       END_STATE();
     case 54:
-      if (lookahead == 'e') ADVANCE(35);
+      if (lookahead == 'c') ADVANCE(110);
       END_STATE();
     case 55:
-      if (lookahead == 'e') ADVANCE(123);
+      if (lookahead == 'c') ADVANCE(194);
       END_STATE();
     case 56:
-      if (lookahead == 'f') ADVANCE(170);
-      if (lookahead == 'n') ADVANCE(181);
+      if (lookahead == 'd') ADVANCE(257);
       END_STATE();
     case 57:
-      if (lookahead == 'f') ADVANCE(82);
+      if (lookahead == 'd') ADVANCE(258);
       END_STATE();
     case 58:
-      if (lookahead == 'f') ADVANCE(78);
+      if (lookahead == 'd') ADVANCE(280);
       END_STATE();
     case 59:
-      if (lookahead == 'f') ADVANCE(79);
+      if (lookahead == 'd') ADVANCE(279);
       END_STATE();
     case 60:
-      if (lookahead == 'g') ADVANCE(180);
+      if (lookahead == 'd') ADVANCE(272);
       END_STATE();
     case 61:
-      if (lookahead == 'g') ADVANCE(47);
+      if (lookahead == 'd') ADVANCE(278);
       END_STATE();
     case 62:
-      if (lookahead == 'h') ADVANCE(20);
-      if (lookahead == 'o') ADVANCE(95);
+      if (lookahead == 'd') ADVANCE(275);
       END_STATE();
     case 63:
-      if (lookahead == 'h') ADVANCE(165);
+      if (lookahead == 'd') ADVANCE(246);
       END_STATE();
     case 64:
-      if (lookahead == 'h') ADVANCE(160);
+      if (lookahead == 'd') ADVANCE(221);
       END_STATE();
     case 65:
-      if (lookahead == 'h') ADVANCE(74);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(134);
+      if (lookahead == 'd') ADVANCE(114);
       END_STATE();
     case 66:
-      if (lookahead == 'h') ADVANCE(45);
-      if (lookahead == 'r') ADVANCE(40);
-      if (lookahead == 't') ADVANCE(184);
+      if (lookahead == 'd') ADVANCE(118);
       END_STATE();
     case 67:
-      if (lookahead == 'h') ADVANCE(45);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(135);
+      if (lookahead == 'e') ADVANCE(245);
+      if (lookahead == 'r') ADVANCE(45);
+      if (lookahead == 'y') ADVANCE(260);
       END_STATE();
     case 68:
-      if (lookahead == 'h') ADVANCE(50);
+      if (lookahead == 'e') ADVANCE(206);
       END_STATE();
     case 69:
-      if (lookahead == 'i') ADVANCE(84);
+      if (lookahead == 'e') ADVANCE(47);
       END_STATE();
     case 70:
-      if (lookahead == 'i') ADVANCE(58);
+      if (lookahead == 'e') ADVANCE(267);
       END_STATE();
     case 71:
-      if (lookahead == 'i') ADVANCE(116);
+      if (lookahead == 'e') ADVANCE(253);
       END_STATE();
     case 72:
-      if (lookahead == 'i') ADVANCE(27);
+      if (lookahead == 'e') ADVANCE(277);
       END_STATE();
     case 73:
-      if (lookahead == 'i') ADVANCE(117);
+      if (lookahead == 'e') ADVANCE(222);
       END_STATE();
     case 74:
-      if (lookahead == 'i') ADVANCE(99);
+      if (lookahead == 'e') ADVANCE(244);
       END_STATE();
     case 75:
-      if (lookahead == 'i') ADVANCE(125);
+      if (lookahead == 'e') ADVANCE(184);
       END_STATE();
     case 76:
-      if (lookahead == 'i') ADVANCE(98);
+      if (lookahead == 'e') ADVANCE(40);
       END_STATE();
     case 77:
-      if (lookahead == 'i') ADVANCE(118);
+      if (lookahead == 'e') ADVANCE(107);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(218);
       END_STATE();
     case 78:
-      if (lookahead == 'i') ADVANCE(52);
+      if (lookahead == 'e') ADVANCE(185);
       END_STATE();
     case 79:
-      if (lookahead == 'i') ADVANCE(85);
+      if (lookahead == 'e') ADVANCE(136);
       END_STATE();
     case 80:
-      if (lookahead == 'k') ADVANCE(53);
+      if (lookahead == 'e') ADVANCE(58);
       END_STATE();
     case 81:
-      if (lookahead == 'l') ADVANCE(128);
+      if (lookahead == 'e') ADVANCE(141);
       END_STATE();
     case 82:
-      if (lookahead == 'l') ADVANCE(72);
+      if (lookahead == 'e') ADVANCE(177);
       END_STATE();
     case 83:
-      if (lookahead == 'l') ADVANCE(55);
-      if (lookahead == 't') ADVANCE(22);
+      if (lookahead == 'e') ADVANCE(59);
       END_STATE();
     case 84:
-      if (lookahead == 'l') ADVANCE(44);
+      if (lookahead == 'e') ADVANCE(60);
       END_STATE();
     case 85:
-      if (lookahead == 'l') ADVANCE(42);
+      if (lookahead == 'e') ADVANCE(158);
       END_STATE();
     case 86:
-      if (lookahead == 'm') ADVANCE(88);
+      if (lookahead == 'e') ADVANCE(61);
       END_STATE();
     case 87:
-      if (lookahead == 'm') ADVANCE(49);
+      if (lookahead == 'e') ADVANCE(62);
       END_STATE();
     case 88:
-      if (lookahead == 'm') ADVANCE(73);
+      if (lookahead == 'e') ADVANCE(19);
       END_STATE();
     case 89:
-      if (lookahead == 'm') ADVANCE(75);
+      if (lookahead == 'e') ADVANCE(63);
       END_STATE();
     case 90:
-      if (lookahead == 'm') ADVANCE(77);
+      if (lookahead == 'e') ADVANCE(21);
       END_STATE();
     case 91:
-      if (lookahead == 'm') ADVANCE(89);
+      if (lookahead == 'e') ADVANCE(64);
       END_STATE();
     case 92:
-      if (lookahead == 'm') ADVANCE(90);
+      if (lookahead == 'e') ADVANCE(17);
       END_STATE();
     case 93:
-      if (lookahead == 'n') ADVANCE(159);
+      if (lookahead == 'e') ADVANCE(18);
       END_STATE();
     case 94:
-      if (lookahead == 'n') ADVANCE(119);
+      if (lookahead == 'e') ADVANCE(197);
       END_STATE();
     case 95:
-      if (lookahead == 'n') ADVANCE(57);
+      if (lookahead == 'f') ADVANCE(259);
+      if (lookahead == 'n') ADVANCE(270);
       END_STATE();
     case 96:
-      if (lookahead == 'n') ADVANCE(61);
+      if (lookahead == 'f') ADVANCE(132);
       END_STATE();
     case 97:
-      if (lookahead == 'n') ADVANCE(25);
+      if (lookahead == 'f') ADVANCE(210);
       END_STATE();
     case 98:
-      if (lookahead == 'n') ADVANCE(60);
+      if (lookahead == 'f') ADVANCE(128);
       END_STATE();
     case 99:
-      if (lookahead == 'n') ADVANCE(29);
+      if (lookahead == 'f') ADVANCE(129);
       END_STATE();
     case 100:
-      if (lookahead == 'n') ADVANCE(120);
+      if (lookahead == 'g') ADVANCE(269);
       END_STATE();
     case 101:
-      if (lookahead == 'o') ADVANCE(126);
+      if (lookahead == 'g') ADVANCE(78);
       END_STATE();
     case 102:
-      if (lookahead == 'o') ADVANCE(86);
-      if (lookahead == 'u') ADVANCE(108);
+      if (lookahead == 'g') ADVANCE(159);
       END_STATE();
     case 103:
-      if (lookahead == 'o') ADVANCE(36);
+      if (lookahead == 'g') ADVANCE(13);
       END_STATE();
     case 104:
-      if (lookahead == 'o') ADVANCE(154);
+      if (lookahead == 'h') ADVANCE(44);
+      if (lookahead == 'o') ADVANCE(151);
       END_STATE();
     case 105:
-      if (lookahead == 'o') ADVANCE(91);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(135);
+      if (lookahead == 'h') ADVANCE(254);
       END_STATE();
     case 106:
-      if (lookahead == 'o') ADVANCE(92);
+      if (lookahead == 'h') ADVANCE(249);
       END_STATE();
     case 107:
-      if (lookahead == 'p') ADVANCE(163);
+      if (lookahead == 'h') ADVANCE(121);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(217);
       END_STATE();
     case 108:
-      if (lookahead == 'r') ADVANCE(110);
+      if (lookahead == 'h') ADVANCE(76);
+      if (lookahead == 'r') ADVANCE(70);
+      if (lookahead == 't') ADVANCE(273);
       END_STATE();
     case 109:
-      if (lookahead == 'r') ADVANCE(17);
+      if (lookahead == 'h') ADVANCE(76);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(218);
       END_STATE();
     case 110:
-      if (lookahead == 'r') ADVANCE(51);
+      if (lookahead == 'h') ADVANCE(84);
       END_STATE();
     case 111:
-      if (lookahead == 's') ADVANCE(162);
+      if (lookahead == 'h') ADVANCE(90);
       END_STATE();
     case 112:
-      if (lookahead == 's') ADVANCE(187);
+      if (lookahead == 'h') ADVANCE(125);
       END_STATE();
     case 113:
-      if (lookahead == 's') ADVANCE(153);
+      if (lookahead == 'i') ADVANCE(135);
       END_STATE();
     case 114:
-      if (lookahead == 's') ADVANCE(185);
+      if (lookahead == 'i') ADVANCE(98);
       END_STATE();
     case 115:
-      if (lookahead == 's') ADVANCE(76);
+      if (lookahead == 'i') ADVANCE(188);
       END_STATE();
     case 116:
-      if (lookahead == 't') ADVANCE(63);
+      if (lookahead == 'i') ADVANCE(55);
       END_STATE();
     case 117:
-      if (lookahead == 't') ADVANCE(175);
+      if (lookahead == 'i') ADVANCE(189);
       END_STATE();
     case 118:
-      if (lookahead == 't') ADVANCE(174);
+      if (lookahead == 'i') ADVANCE(97);
       END_STATE();
     case 119:
-      if (lookahead == 't') ADVANCE(109);
+      if (lookahead == 'i') ADVANCE(102);
       END_STATE();
     case 120:
-      if (lookahead == 't') ADVANCE(81);
+      if (lookahead == 'i') ADVANCE(134);
       END_STATE();
     case 121:
-      if (lookahead == 't') ADVANCE(114);
+      if (lookahead == 'i') ADVANCE(155);
       END_STATE();
     case 122:
-      if (lookahead == 't') ADVANCE(41);
+      if (lookahead == 'i') ADVANCE(154);
       END_STATE();
     case 123:
-      if (lookahead == 't') ADVANCE(48);
+      if (lookahead == 'i') ADVANCE(160);
       END_STATE();
     case 124:
-      if (lookahead == 't') ADVANCE(54);
+      if (lookahead == 'i') ADVANCE(198);
       END_STATE();
     case 125:
-      if (lookahead == 't') ADVANCE(124);
+      if (lookahead == 'i') ADVANCE(156);
       END_STATE();
     case 126:
-      if (lookahead == 'u') ADVANCE(177);
+      if (lookahead == 'i') ADVANCE(201);
       END_STATE();
     case 127:
-      if (lookahead == 'w') ADVANCE(7);
+      if (lookahead == 'i') ADVANCE(190);
       END_STATE();
     case 128:
-      if (lookahead == 'y') ADVANCE(179);
+      if (lookahead == 'i') ADVANCE(86);
       END_STATE();
     case 129:
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(129)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(262);
-      if (lookahead != 0 &&
-          (lookahead < '\n' || '\r' < lookahead) &&
-          lookahead != '\'' &&
-          lookahead != '.') ADVANCE(263);
+      if (lookahead == 'i') ADVANCE(137);
       END_STATE();
     case 130:
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(130)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(258);
-      if (lookahead != 0 &&
-          (lookahead < '\n' || '\r' < lookahead)) ADVANCE(261);
+      if (lookahead == 'k') ADVANCE(87);
       END_STATE();
     case 131:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(227);
+      if (lookahead == 'l') ADVANCE(209);
       END_STATE();
     case 132:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(131);
+      if (lookahead == 'l') ADVANCE(116);
       END_STATE();
     case 133:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(132);
+      if (lookahead == 'l') ADVANCE(94);
+      if (lookahead == 't') ADVANCE(46);
       END_STATE();
     case 134:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(133);
+      if (lookahead == 'l') ADVANCE(138);
       END_STATE();
     case 135:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(134);
+      if (lookahead == 'l') ADVANCE(75);
       END_STATE();
     case 136:
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(135);
+      if (lookahead == 'l') ADVANCE(170);
       END_STATE();
     case 137:
-      if (lookahead != 0 &&
-          lookahead != '\t' &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(269);
+      if (lookahead == 'l') ADVANCE(72);
       END_STATE();
     case 138:
-      if (eof) ADVANCE(143);
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '#') ADVANCE(152);
-      if (lookahead == '@') ADVANCE(149);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(138)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(150);
-      if (lookahead != 0) ADVANCE(151);
+      if (lookahead == 'l') ADVANCE(22);
       END_STATE();
     case 139:
-      if (eof) ADVANCE(143);
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == 'C') ADVANCE(243);
-      if (lookahead == 'H') ADVANCE(233);
-      if (lookahead == 'O') ADVANCE(247);
-      if (lookahead == 'U') ADVANCE(248);
-      if (lookahead == 'Y') ADVANCE(251);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(139)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(229);
-      if (lookahead != 0) ADVANCE(261);
+      if (lookahead == 'l') ADVANCE(123);
       END_STATE();
     case 140:
-      if (eof) ADVANCE(143);
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(140)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(266);
-      if (lookahead != 0) ADVANCE(267);
+      if (lookahead == 'm') ADVANCE(144);
       END_STATE();
     case 141:
-      if (eof) ADVANCE(143);
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(141)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(230);
-      if (lookahead != 0) ADVANCE(261);
+      if (lookahead == 'm') ADVANCE(165);
       END_STATE();
     case 142:
-      if (eof) ADVANCE(143);
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (('\t' <= lookahead && lookahead <= '\f') ||
-          lookahead == ' ') ADVANCE(147);
-      if (lookahead != 0) ADVANCE(148);
+      if (lookahead == 'm') ADVANCE(83);
       END_STATE();
     case 143:
-      ACCEPT_TOKEN(ts_builtin_sym_end);
+      if (lookahead == 'm') ADVANCE(169);
       END_STATE();
     case 144:
-      ACCEPT_TOKEN(aux_sym_source_token1);
+      if (lookahead == 'm') ADVANCE(117);
       END_STATE();
     case 145:
-      ACCEPT_TOKEN(aux_sym_subject_token1);
+      if (lookahead == 'm') ADVANCE(126);
       END_STATE();
     case 146:
-      ACCEPT_TOKEN(aux_sym_subject_token1);
-      if (lookahead == '@') ADVANCE(145);
-      if (lookahead == '\t' ||
-          lookahead == ' ') ADVANCE(146);
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(146);
-      if (lookahead != 0 &&
-          (lookahead < '\n' || '\r' < lookahead) &&
-          lookahead != '#') ADVANCE(145);
+      if (lookahead == 'm') ADVANCE(127);
       END_STATE();
     case 147:
-      ACCEPT_TOKEN(aux_sym_subject_token2);
-      if (lookahead == '\t' ||
-          lookahead == 11 ||
-          lookahead == '\f' ||
-          lookahead == ' ') ADVANCE(147);
-      if (lookahead != 0 &&
-          (lookahead < '\n' || '\r' < lookahead)) ADVANCE(148);
+      if (lookahead == 'm') ADVANCE(145);
       END_STATE();
     case 148:
-      ACCEPT_TOKEN(aux_sym_subject_token2);
-      if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != '\r') ADVANCE(148);
+      if (lookahead == 'm') ADVANCE(146);
       END_STATE();
     case 149:
-      ACCEPT_TOKEN(aux_sym_message_token1);
-      if (lookahead == '#') ADVANCE(269);
-      if (lookahead != 0 &&
-          lookahead != '\t' &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(268);
+      if (lookahead == 'n') ADVANCE(248);
       END_STATE();
     case 150:
-      ACCEPT_TOKEN(aux_sym_message_token1);
-      if (lookahead == '@') ADVANCE(149);
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(150);
-      if (lookahead != 0 &&
-          (lookahead < '\t' || '\r' < lookahead) &&
-          lookahead != ' ' &&
-          lookahead != '#') ADVANCE(151);
+      if (lookahead == 'n') ADVANCE(191);
       END_STATE();
     case 151:
-      ACCEPT_TOKEN(aux_sym_message_token1);
-      if (lookahead != 0 &&
-          lookahead != '\t' &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != ' ' &&
-          lookahead != '#') ADVANCE(151);
+      if (lookahead == 'n') ADVANCE(96);
       END_STATE();
     case 152:
-      ACCEPT_TOKEN(anon_sym_POUND);
+      if (lookahead == 'n') ADVANCE(101);
       END_STATE();
     case 153:
-      ACCEPT_TOKEN(anon_sym_Changes);
+      if (lookahead == 'n') ADVANCE(53);
       END_STATE();
     case 154:
-      ACCEPT_TOKEN(anon_sym_to);
+      if (lookahead == 'n') ADVANCE(100);
       END_STATE();
     case 155:
-      ACCEPT_TOKEN(anon_sym_be);
+      if (lookahead == 'n') ADVANCE(57);
       END_STATE();
     case 156:
-      ACCEPT_TOKEN(anon_sym_be);
-      if (lookahead == 'h') ADVANCE(74);
+      if (lookahead == 'n') ADVANCE(103);
       END_STATE();
     case 157:
-      ACCEPT_TOKEN(anon_sym_committed);
+      if (lookahead == 'n') ADVANCE(168);
       END_STATE();
     case 158:
-      ACCEPT_TOKEN(anon_sym_COLON);
+      if (lookahead == 'n') ADVANCE(192);
       END_STATE();
     case 159:
-      ACCEPT_TOKEN(anon_sym_On);
+      if (lookahead == 'n') ADVANCE(172);
       END_STATE();
     case 160:
-      ACCEPT_TOKEN(anon_sym_branch);
+      if (lookahead == 'n') ADVANCE(92);
       END_STATE();
     case 161:
-      ACCEPT_TOKEN(anon_sym_Your);
+      if (lookahead == 'o') ADVANCE(202);
       END_STATE();
     case 162:
-      ACCEPT_TOKEN(anon_sym_is);
+      if (lookahead == 'o') ADVANCE(140);
+      if (lookahead == 'u') ADVANCE(176);
       END_STATE();
     case 163:
-      ACCEPT_TOKEN(anon_sym_up);
+      if (lookahead == 'o') ADVANCE(65);
       END_STATE();
     case 164:
-      ACCEPT_TOKEN(anon_sym_date);
+      if (lookahead == 'o') ADVANCE(243);
       END_STATE();
     case 165:
-      ACCEPT_TOKEN(anon_sym_with);
+      if (lookahead == 'o') ADVANCE(203);
       END_STATE();
     case 166:
-      ACCEPT_TOKEN(anon_sym_SQUOTE);
+      if (lookahead == 'o') ADVANCE(179);
       END_STATE();
     case 167:
-      ACCEPT_TOKEN(anon_sym_SQUOTE_DOT);
+      if (lookahead == 'o') ADVANCE(20);
       END_STATE();
     case 168:
-      ACCEPT_TOKEN(anon_sym_ahead);
+      if (lookahead == 'o') ADVANCE(196);
       END_STATE();
     case 169:
-      ACCEPT_TOKEN(anon_sym_behind);
+      if (lookahead == 'o') ADVANCE(66);
       END_STATE();
     case 170:
-      ACCEPT_TOKEN(anon_sym_of);
+      if (lookahead == 'o') ADVANCE(207);
       END_STATE();
     case 171:
-      ACCEPT_TOKEN(anon_sym_by);
+      if (lookahead == 'o') ADVANCE(204);
       END_STATE();
     case 172:
-      ACCEPT_TOKEN(aux_sym__branch_declaration_token1);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(172);
+      if (lookahead == 'o') ADVANCE(182);
       END_STATE();
     case 173:
-      ACCEPT_TOKEN(aux_sym__branch_declaration_token2);
+      if (lookahead == 'o') ADVANCE(147);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(218);
       END_STATE();
     case 174:
-      ACCEPT_TOKEN(aux_sym__branch_declaration_token2);
-      if (lookahead == 's') ADVANCE(173);
+      if (lookahead == 'o') ADVANCE(148);
       END_STATE();
     case 175:
-      ACCEPT_TOKEN(aux_sym__branch_declaration_token2);
-      if (lookahead == 's') ADVANCE(173);
-      if (lookahead == 't') ADVANCE(54);
+      if (lookahead == 'p') ADVANCE(252);
       END_STATE();
     case 176:
-      ACCEPT_TOKEN(anon_sym_DOT);
+      if (lookahead == 'r') ADVANCE(180);
       END_STATE();
     case 177:
-      ACCEPT_TOKEN(anon_sym_You);
-      if (lookahead == 'r') ADVANCE(161);
+      if (lookahead == 'r') ADVANCE(211);
       END_STATE();
     case 178:
-      ACCEPT_TOKEN(anon_sym_are);
+      if (lookahead == 'r') ADVANCE(41);
       END_STATE();
     case 179:
-      ACCEPT_TOKEN(anon_sym_currently);
+      if (lookahead == 'r') ADVANCE(23);
       END_STATE();
     case 180:
-      ACCEPT_TOKEN(anon_sym_rebasing);
+      if (lookahead == 'r') ADVANCE(85);
       END_STATE();
     case 181:
-      ACCEPT_TOKEN(anon_sym_on);
+      if (lookahead == 'r') ADVANCE(81);
       END_STATE();
     case 182:
-      ACCEPT_TOKEN(anon_sym_HEAD);
+      if (lookahead == 'r') ADVANCE(91);
       END_STATE();
     case 183:
-      ACCEPT_TOKEN(anon_sym_detached);
+      if (lookahead == 's') ADVANCE(251);
       END_STATE();
     case 184:
-      ACCEPT_TOKEN(anon_sym_at);
+      if (lookahead == 's') ADVANCE(276);
       END_STATE();
     case 185:
-      ACCEPT_TOKEN(anon_sym_Conflicts);
+      if (lookahead == 's') ADVANCE(242);
       END_STATE();
     case 186:
-      ACCEPT_TOKEN(anon_sym_Untracked);
+      if (lookahead == 's') ADVANCE(274);
       END_STATE();
     case 187:
-      ACCEPT_TOKEN(anon_sym_files);
+      if (lookahead == 's') ADVANCE(122);
       END_STATE();
     case 188:
-      ACCEPT_TOKEN(anon_sym_newfile);
+      if (lookahead == 't') ADVANCE(105);
       END_STATE();
     case 189:
-      ACCEPT_TOKEN(anon_sym_modified);
+      if (lookahead == 't') ADVANCE(264);
       END_STATE();
     case 190:
-      ACCEPT_TOKEN(anon_sym_renamed);
+      if (lookahead == 't') ADVANCE(263);
       END_STATE();
     case 191:
-      ACCEPT_TOKEN(anon_sym_deleted);
+      if (lookahead == 't') ADVANCE(178);
       END_STATE();
     case 192:
-      ACCEPT_TOKEN(anon_sym_COLON2);
+      if (lookahead == 't') ADVANCE(131);
       END_STATE();
     case 193:
-      ACCEPT_TOKEN(anon_sym_DASH_GT);
+      if (lookahead == 't') ADVANCE(112);
       END_STATE();
     case 194:
-      ACCEPT_TOKEN(sym_commit);
+      if (lookahead == 't') ADVANCE(186);
       END_STATE();
     case 195:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(194);
+      if (lookahead == 't') ADVANCE(71);
       END_STATE();
     case 196:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(195);
+      if (lookahead == 't') ADVANCE(15);
       END_STATE();
     case 197:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(196);
+      if (lookahead == 't') ADVANCE(80);
       END_STATE();
     case 198:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(197);
+      if (lookahead == 't') ADVANCE(11);
       END_STATE();
     case 199:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(198);
+      if (lookahead == 't') ADVANCE(89);
       END_STATE();
     case 200:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(199);
+      if (lookahead == 't') ADVANCE(111);
       END_STATE();
     case 201:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(200);
+      if (lookahead == 't') ADVANCE(199);
       END_STATE();
     case 202:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(201);
+      if (lookahead == 'u') ADVANCE(266);
       END_STATE();
     case 203:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(202);
+      if (lookahead == 'v') ADVANCE(88);
       END_STATE();
     case 204:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(203);
+      if (lookahead == 'v') ADVANCE(73);
       END_STATE();
     case 205:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(204);
+      if (lookahead == 'v') ADVANCE(82);
       END_STATE();
     case 206:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(205);
+      if (lookahead == 'w') ADVANCE(14);
       END_STATE();
     case 207:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(206);
+      if (lookahead == 'w') ADVANCE(24);
       END_STATE();
     case 208:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(207);
+      if (lookahead == 'w') ADVANCE(120);
       END_STATE();
     case 209:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(208);
+      if (lookahead == 'y') ADVANCE(268);
       END_STATE();
     case 210:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(209);
+      if (lookahead == 'y') ADVANCE(16);
       END_STATE();
     case 211:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(210);
+      if (lookahead == 'y') ADVANCE(193);
       END_STATE();
     case 212:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(211);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(212)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(350);
+      if (lookahead != 0 &&
+          (lookahead < '\n' || '\r' < lookahead) &&
+          lookahead != '\'' &&
+          lookahead != '.') ADVANCE(351);
       END_STATE();
     case 213:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(212);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(213)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(347);
+      if (lookahead != 0 &&
+          (lookahead < '\n' || '\r' < lookahead)) ADVANCE(349);
       END_STATE();
     case 214:
-      ACCEPT_TOKEN(sym_commit);
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(213);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(315);
       END_STATE();
     case 215:
-      ACCEPT_TOKEN(sym_commit);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(214);
       END_STATE();
     case 216:
-      ACCEPT_TOKEN(sym_commit);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(215);
       END_STATE();
     case 217:
-      ACCEPT_TOKEN(sym_commit);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(216);
       END_STATE();
     case 218:
-      ACCEPT_TOKEN(sym_commit);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(217);
       END_STATE();
     case 219:
-      ACCEPT_TOKEN(sym_commit);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(218);
       END_STATE();
     case 220:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(219);
+      if (lookahead != 0 &&
+          lookahead != '\t' &&
+          lookahead != '\n' &&
+          lookahead != '\r' &&
+          lookahead != ' ' &&
+          lookahead != '@') ADVANCE(357);
       END_STATE();
     case 221:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(220);
+      if (lookahead != 0 &&
+          lookahead != '\n') ADVANCE(239);
       END_STATE();
     case 222:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(221);
+      if (lookahead != 0 &&
+          lookahead != '\n') ADVANCE(7);
       END_STATE();
     case 223:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(222);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == '#') ADVANCE(241);
+      if (lookahead == '@') ADVANCE(236);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(223)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(237);
+      if (lookahead != 0) ADVANCE(238);
       END_STATE();
     case 224:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(223);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == '#') ADVANCE(241);
+      if (('\t' <= lookahead && lookahead <= '\f') ||
+          lookahead == ' ') ADVANCE(233);
+      if (lookahead != 0) ADVANCE(232);
       END_STATE();
     case 225:
-      ACCEPT_TOKEN(sym_commit);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == '#') ADVANCE(240);
+      if (lookahead == '\'') ADVANCE(29);
+      if (lookahead == 'a') ADVANCE(109);
+      if (lookahead == 'b') ADVANCE(77);
+      if (lookahead == 'c') ADVANCE(173);
+      if (lookahead == 'u') ADVANCE(175);
+      if (('\t' <= lookahead && lookahead <= '\f') ||
+          lookahead == ' ') SKIP(225)
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(224);
+          ('d' <= lookahead && lookahead <= 'f')) ADVANCE(219);
       END_STATE();
     case 226:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(225);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == 'C') ADVANCE(332);
+      if (lookahead == 'H') ADVANCE(322);
+      if (lookahead == 'O') ADVANCE(336);
+      if (lookahead == 'U') ADVANCE(337);
+      if (lookahead == 'Y') ADVANCE(340);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(226)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(317);
+      if (lookahead != 0) ADVANCE(349);
       END_STATE();
     case 227:
-      ACCEPT_TOKEN(sym_commit);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(226);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(227)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(354);
+      if (lookahead != 0) ADVANCE(355);
       END_STATE();
     case 228:
-      ACCEPT_TOKEN(sym__word);
-      if (lookahead == '\n') ADVANCE(144);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '#') ADVANCE(259);
-      if (lookahead == '@') ADVANCE(260);
       if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(3)
+          lookahead == ' ') SKIP(228)
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(228);
-      if (lookahead != 0) ADVANCE(261);
+          lookahead == '\f') ADVANCE(318);
+      if (lookahead != 0) ADVANCE(349);
       END_STATE();
     case 229:
-      ACCEPT_TOKEN(sym__word);
-      if (lookahead == '\n') ADVANCE(144);
+      if (eof) ADVANCE(230);
+      if (lookahead == '\n') ADVANCE(231);
       if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == 'C') ADVANCE(243);
-      if (lookahead == 'H') ADVANCE(233);
-      if (lookahead == 'O') ADVANCE(247);
-      if (lookahead == 'U') ADVANCE(248);
-      if (lookahead == 'Y') ADVANCE(251);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(5)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(229);
-      if (lookahead != 0) ADVANCE(261);
+      if (('\t' <= lookahead && lookahead <= '\f') ||
+          lookahead == ' ') ADVANCE(234);
+      if (lookahead != 0) ADVANCE(235);
       END_STATE();
     case 230:
-      ACCEPT_TOKEN(sym__word);
-      if (lookahead == '\n') ADVANCE(144);
-      if (lookahead == '\r') ADVANCE(1);
-      if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(6)
-      if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(230);
-      if (lookahead != 0) ADVANCE(261);
+      ACCEPT_TOKEN(ts_builtin_sym_end);
       END_STATE();
     case 231:
-      ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'A') ADVANCE(232);
-      if (lookahead != 0 &&
-          lookahead != '\t' &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+      ACCEPT_TOKEN(aux_sym_source_token1);
       END_STATE();
     case 232:
-      ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'D') ADVANCE(182);
+      ACCEPT_TOKEN(aux_sym_subject_token1);
+      END_STATE();
+    case 233:
+      ACCEPT_TOKEN(aux_sym_subject_token1);
+      if (lookahead == '\t' ||
+          lookahead == 11 ||
+          lookahead == '\f' ||
+          lookahead == ' ') ADVANCE(233);
+      if (lookahead != 0 &&
+          (lookahead < '\n' || '\r' < lookahead) &&
+          lookahead != '#') ADVANCE(232);
+      END_STATE();
+    case 234:
+      ACCEPT_TOKEN(aux_sym_subject_token2);
+      if (lookahead == '\t' ||
+          lookahead == 11 ||
+          lookahead == '\f' ||
+          lookahead == ' ') ADVANCE(234);
+      if (lookahead != 0 &&
+          (lookahead < '\n' || '\r' < lookahead)) ADVANCE(235);
+      END_STATE();
+    case 235:
+      ACCEPT_TOKEN(aux_sym_subject_token2);
+      if (lookahead != 0 &&
+          lookahead != '\n' &&
+          lookahead != '\r') ADVANCE(235);
+      END_STATE();
+    case 236:
+      ACCEPT_TOKEN(aux_sym_message_token1);
+      if (lookahead == '#') ADVANCE(357);
+      if (lookahead == '@') ADVANCE(238);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(356);
       END_STATE();
-    case 233:
+    case 237:
+      ACCEPT_TOKEN(aux_sym_message_token1);
+      if (lookahead == '@') ADVANCE(236);
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(237);
+      if (lookahead != 0 &&
+          (lookahead < '\t' || '\r' < lookahead) &&
+          lookahead != ' ' &&
+          lookahead != '#') ADVANCE(238);
+      END_STATE();
+    case 238:
+      ACCEPT_TOKEN(aux_sym_message_token1);
+      if (lookahead != 0 &&
+          lookahead != '\t' &&
+          lookahead != '\n' &&
+          lookahead != '\r' &&
+          lookahead != ' ' &&
+          lookahead != '#') ADVANCE(238);
+      END_STATE();
+    case 239:
+      ACCEPT_TOKEN(aux_sym_comment_token1);
+      END_STATE();
+    case 240:
+      ACCEPT_TOKEN(anon_sym_POUND);
+      END_STATE();
+    case 241:
+      ACCEPT_TOKEN(anon_sym_POUND);
+      if (lookahead == ' ') ADVANCE(27);
+      END_STATE();
+    case 242:
+      ACCEPT_TOKEN(anon_sym_Changes);
+      END_STATE();
+    case 243:
+      ACCEPT_TOKEN(anon_sym_to);
+      END_STATE();
+    case 244:
+      ACCEPT_TOKEN(anon_sym_be);
+      END_STATE();
+    case 245:
+      ACCEPT_TOKEN(anon_sym_be);
+      if (lookahead == 'h') ADVANCE(121);
+      END_STATE();
+    case 246:
+      ACCEPT_TOKEN(anon_sym_committed);
+      END_STATE();
+    case 247:
+      ACCEPT_TOKEN(anon_sym_COLON);
+      END_STATE();
+    case 248:
+      ACCEPT_TOKEN(anon_sym_On);
+      END_STATE();
+    case 249:
+      ACCEPT_TOKEN(anon_sym_branch);
+      END_STATE();
+    case 250:
+      ACCEPT_TOKEN(anon_sym_Your);
+      END_STATE();
+    case 251:
+      ACCEPT_TOKEN(anon_sym_is);
+      END_STATE();
+    case 252:
+      ACCEPT_TOKEN(anon_sym_up);
+      END_STATE();
+    case 253:
+      ACCEPT_TOKEN(anon_sym_date);
+      END_STATE();
+    case 254:
+      ACCEPT_TOKEN(anon_sym_with);
+      END_STATE();
+    case 255:
+      ACCEPT_TOKEN(anon_sym_SQUOTE);
+      END_STATE();
+    case 256:
+      ACCEPT_TOKEN(anon_sym_SQUOTE_DOT);
+      END_STATE();
+    case 257:
+      ACCEPT_TOKEN(anon_sym_ahead);
+      END_STATE();
+    case 258:
+      ACCEPT_TOKEN(anon_sym_behind);
+      END_STATE();
+    case 259:
+      ACCEPT_TOKEN(anon_sym_of);
+      END_STATE();
+    case 260:
+      ACCEPT_TOKEN(anon_sym_by);
+      END_STATE();
+    case 261:
+      ACCEPT_TOKEN(aux_sym__branch_declaration_token1);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(261);
+      END_STATE();
+    case 262:
+      ACCEPT_TOKEN(aux_sym__branch_declaration_token2);
+      END_STATE();
+    case 263:
+      ACCEPT_TOKEN(aux_sym__branch_declaration_token2);
+      if (lookahead == 's') ADVANCE(262);
+      END_STATE();
+    case 264:
+      ACCEPT_TOKEN(aux_sym__branch_declaration_token2);
+      if (lookahead == 's') ADVANCE(262);
+      if (lookahead == 't') ADVANCE(89);
+      END_STATE();
+    case 265:
+      ACCEPT_TOKEN(anon_sym_DOT);
+      END_STATE();
+    case 266:
+      ACCEPT_TOKEN(anon_sym_You);
+      if (lookahead == 'r') ADVANCE(250);
+      END_STATE();
+    case 267:
+      ACCEPT_TOKEN(anon_sym_are);
+      END_STATE();
+    case 268:
+      ACCEPT_TOKEN(anon_sym_currently);
+      END_STATE();
+    case 269:
+      ACCEPT_TOKEN(anon_sym_rebasing);
+      END_STATE();
+    case 270:
+      ACCEPT_TOKEN(anon_sym_on);
+      END_STATE();
+    case 271:
+      ACCEPT_TOKEN(anon_sym_HEAD);
+      END_STATE();
+    case 272:
+      ACCEPT_TOKEN(anon_sym_detached);
+      END_STATE();
+    case 273:
+      ACCEPT_TOKEN(anon_sym_at);
+      END_STATE();
+    case 274:
+      ACCEPT_TOKEN(anon_sym_Conflicts);
+      END_STATE();
+    case 275:
+      ACCEPT_TOKEN(anon_sym_Untracked);
+      END_STATE();
+    case 276:
+      ACCEPT_TOKEN(anon_sym_files);
+      END_STATE();
+    case 277:
+      ACCEPT_TOKEN(anon_sym_newfile);
+      END_STATE();
+    case 278:
+      ACCEPT_TOKEN(anon_sym_modified);
+      END_STATE();
+    case 279:
+      ACCEPT_TOKEN(anon_sym_renamed);
+      END_STATE();
+    case 280:
+      ACCEPT_TOKEN(anon_sym_deleted);
+      END_STATE();
+    case 281:
+      ACCEPT_TOKEN(anon_sym_DASH_GT);
+      END_STATE();
+    case 282:
+      ACCEPT_TOKEN(sym_commit);
+      END_STATE();
+    case 283:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(282);
+      END_STATE();
+    case 284:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(283);
+      END_STATE();
+    case 285:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(284);
+      END_STATE();
+    case 286:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(285);
+      END_STATE();
+    case 287:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(286);
+      END_STATE();
+    case 288:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(287);
+      END_STATE();
+    case 289:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(288);
+      END_STATE();
+    case 290:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(289);
+      END_STATE();
+    case 291:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(290);
+      END_STATE();
+    case 292:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(291);
+      END_STATE();
+    case 293:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(292);
+      END_STATE();
+    case 294:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(293);
+      END_STATE();
+    case 295:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(294);
+      END_STATE();
+    case 296:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(295);
+      END_STATE();
+    case 297:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(296);
+      END_STATE();
+    case 298:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(297);
+      END_STATE();
+    case 299:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(298);
+      END_STATE();
+    case 300:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(299);
+      END_STATE();
+    case 301:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(300);
+      END_STATE();
+    case 302:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(301);
+      END_STATE();
+    case 303:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(302);
+      END_STATE();
+    case 304:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(303);
+      END_STATE();
+    case 305:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(304);
+      END_STATE();
+    case 306:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(305);
+      END_STATE();
+    case 307:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(306);
+      END_STATE();
+    case 308:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(307);
+      END_STATE();
+    case 309:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(308);
+      END_STATE();
+    case 310:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(309);
+      END_STATE();
+    case 311:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(310);
+      END_STATE();
+    case 312:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(311);
+      END_STATE();
+    case 313:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(312);
+      END_STATE();
+    case 314:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(313);
+      END_STATE();
+    case 315:
+      ACCEPT_TOKEN(sym_commit);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(314);
+      END_STATE();
+    case 316:
+      ACCEPT_TOKEN(sym__word);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == '#') ADVANCE(348);
+      if (lookahead == '@') ADVANCE(319);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(2)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(316);
+      if (lookahead != 0) ADVANCE(349);
+      END_STATE();
+    case 317:
+      ACCEPT_TOKEN(sym__word);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == 'C') ADVANCE(332);
+      if (lookahead == 'H') ADVANCE(322);
+      if (lookahead == 'O') ADVANCE(336);
+      if (lookahead == 'U') ADVANCE(337);
+      if (lookahead == 'Y') ADVANCE(340);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(4)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(317);
+      if (lookahead != 0) ADVANCE(349);
+      END_STATE();
+    case 318:
+      ACCEPT_TOKEN(sym__word);
+      if (lookahead == '\n') ADVANCE(231);
+      if (lookahead == '\r') ADVANCE(1);
+      if (lookahead == '\t' ||
+          lookahead == ' ') SKIP(5)
+      if (lookahead == 11 ||
+          lookahead == '\f') ADVANCE(318);
+      if (lookahead != 0) ADVANCE(349);
+      END_STATE();
+    case 319:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'E') ADVANCE(231);
+      if (lookahead == '@') ADVANCE(349);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(357);
       END_STATE();
-    case 234:
+    case 320:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'a') ADVANCE(236);
+      if (lookahead == 'A') ADVANCE(321);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 235:
+    case 321:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'a') ADVANCE(250);
+      if (lookahead == 'D') ADVANCE(271);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 236:
+    case 322:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'c') ADVANCE(245);
+      if (lookahead == 'E') ADVANCE(320);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 237:
+    case 323:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'c') ADVANCE(256);
+      if (lookahead == 'a') ADVANCE(325);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 238:
+    case 324:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'd') ADVANCE(186);
+      if (lookahead == 'a') ADVANCE(339);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 239:
+    case 325:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'e') ADVANCE(253);
+      if (lookahead == 'c') ADVANCE(334);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 240:
+    case 326:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'e') ADVANCE(238);
+      if (lookahead == 'c') ADVANCE(345);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 241:
+    case 327:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'f') ADVANCE(246);
+      if (lookahead == 'd') ADVANCE(275);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 242:
+    case 328:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'g') ADVANCE(239);
+      if (lookahead == 'e') ADVANCE(342);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 243:
+    case 329:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'h') ADVANCE(235);
-      if (lookahead == 'o') ADVANCE(249);
+      if (lookahead == 'e') ADVANCE(327);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 244:
+    case 330:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'i') ADVANCE(237);
+      if (lookahead == 'f') ADVANCE(335);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 245:
+    case 331:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'k') ADVANCE(240);
+      if (lookahead == 'g') ADVANCE(328);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 246:
+    case 332:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'l') ADVANCE(244);
+      if (lookahead == 'h') ADVANCE(324);
+      if (lookahead == 'o') ADVANCE(338);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 247:
+    case 333:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'n') ADVANCE(159);
+      if (lookahead == 'i') ADVANCE(326);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 248:
+    case 334:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'n') ADVANCE(255);
+      if (lookahead == 'k') ADVANCE(329);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 249:
+    case 335:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'n') ADVANCE(241);
+      if (lookahead == 'l') ADVANCE(333);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 250:
+    case 336:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'n') ADVANCE(242);
+      if (lookahead == 'n') ADVANCE(248);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 251:
+    case 337:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'o') ADVANCE(257);
+      if (lookahead == 'n') ADVANCE(344);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 252:
+    case 338:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'r') ADVANCE(234);
+      if (lookahead == 'n') ADVANCE(330);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 253:
+    case 339:
+      ACCEPT_TOKEN(sym__word);
+      if (lookahead == 'n') ADVANCE(331);
+      if (lookahead != 0 &&
+          lookahead != '\t' &&
+          lookahead != '\n' &&
+          lookahead != '\r' &&
+          lookahead != ' ') ADVANCE(349);
+      END_STATE();
+    case 340:
+      ACCEPT_TOKEN(sym__word);
+      if (lookahead == 'o') ADVANCE(346);
+      if (lookahead != 0 &&
+          lookahead != '\t' &&
+          lookahead != '\n' &&
+          lookahead != '\r' &&
+          lookahead != ' ') ADVANCE(349);
+      END_STATE();
+    case 341:
+      ACCEPT_TOKEN(sym__word);
+      if (lookahead == 'r') ADVANCE(323);
+      if (lookahead != 0 &&
+          lookahead != '\t' &&
+          lookahead != '\n' &&
+          lookahead != '\r' &&
+          lookahead != ' ') ADVANCE(349);
+      END_STATE();
+    case 342:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 's') ADVANCE(153);
+      if (lookahead == 's') ADVANCE(242);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 254:
+    case 343:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 's') ADVANCE(185);
+      if (lookahead == 's') ADVANCE(274);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 255:
+    case 344:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 't') ADVANCE(252);
+      if (lookahead == 't') ADVANCE(341);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 256:
+    case 345:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 't') ADVANCE(254);
+      if (lookahead == 't') ADVANCE(343);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 257:
+    case 346:
       ACCEPT_TOKEN(sym__word);
-      if (lookahead == 'u') ADVANCE(177);
+      if (lookahead == 'u') ADVANCE(266);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 258:
+    case 347:
       ACCEPT_TOKEN(sym__word);
       if (lookahead == '\t' ||
-          lookahead == ' ') SKIP(130)
+          lookahead == ' ') SKIP(213)
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(258);
-      if (lookahead != 0 &&
-          (lookahead < '\n' || '\r' < lookahead)) ADVANCE(261);
-      END_STATE();
-    case 259:
-      ACCEPT_TOKEN(sym__word);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(270);
+          lookahead == '\f') ADVANCE(347);
       if (lookahead != 0 &&
-          lookahead != '\t' &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          (lookahead < '\n' || '\r' < lookahead)) ADVANCE(349);
       END_STATE();
-    case 260:
+    case 348:
       ACCEPT_TOKEN(sym__word);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(358);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(269);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 261:
+    case 349:
       ACCEPT_TOKEN(sym__word);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(261);
+          lookahead != ' ') ADVANCE(349);
       END_STATE();
-    case 262:
+    case 350:
       ACCEPT_TOKEN(sym_branch);
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(262);
+          lookahead == '\f') ADVANCE(350);
       if (lookahead != 0 &&
           (lookahead < '\t' || '\r' < lookahead) &&
           lookahead != ' ' &&
           lookahead != '\'' &&
-          lookahead != '.') ADVANCE(263);
+          lookahead != '.') ADVANCE(351);
       END_STATE();
-    case 263:
+    case 351:
       ACCEPT_TOKEN(sym_branch);
       if (lookahead != 0 &&
           lookahead != '\t' &&
@@ -1834,62 +2111,64 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '\r' &&
           lookahead != ' ' &&
           lookahead != '\'' &&
-          lookahead != '.') ADVANCE(263);
+          lookahead != '.') ADVANCE(351);
       END_STATE();
-    case 264:
+    case 352:
       ACCEPT_TOKEN(aux_sym_path_token1);
-      if (lookahead == '-') ADVANCE(265);
+      if (lookahead == '-') ADVANCE(353);
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(264);
+          lookahead == '\f') ADVANCE(352);
       if (lookahead != 0 &&
           (lookahead < '\t' || '\r' < lookahead) &&
-          lookahead != ' ') ADVANCE(267);
+          lookahead != ' ') ADVANCE(355);
       END_STATE();
-    case 265:
+    case 353:
       ACCEPT_TOKEN(aux_sym_path_token1);
-      if (lookahead == '>') ADVANCE(193);
+      if (lookahead == '>') ADVANCE(281);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(267);
+          lookahead != ' ') ADVANCE(355);
       END_STATE();
-    case 266:
+    case 354:
       ACCEPT_TOKEN(aux_sym_path_token1);
       if (lookahead == 11 ||
-          lookahead == '\f') ADVANCE(266);
+          lookahead == '\f') ADVANCE(354);
       if (lookahead != 0 &&
           (lookahead < '\t' || '\r' < lookahead) &&
-          lookahead != ' ') ADVANCE(267);
+          lookahead != ' ') ADVANCE(355);
       END_STATE();
-    case 267:
+    case 355:
       ACCEPT_TOKEN(aux_sym_path_token1);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(267);
+          lookahead != ' ') ADVANCE(355);
       END_STATE();
-    case 268:
+    case 356:
       ACCEPT_TOKEN(sym_user);
-      if (lookahead == '#') ADVANCE(269);
+      if (lookahead == '#') ADVANCE(357);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(268);
+          lookahead != ' ' &&
+          lookahead != '@') ADVANCE(356);
       END_STATE();
-    case 269:
+    case 357:
       ACCEPT_TOKEN(sym_user);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
-          lookahead != ' ') ADVANCE(269);
+          lookahead != ' ' &&
+          lookahead != '@') ADVANCE(357);
       END_STATE();
-    case 270:
+    case 358:
       ACCEPT_TOKEN(sym_item);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(270);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(358);
       END_STATE();
     default:
       return false;
@@ -1898,46 +2177,46 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
 
 static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [0] = {.lex_state = 0},
-  [1] = {.lex_state = 2},
-  [2] = {.lex_state = 139},
-  [3] = {.lex_state = 139},
-  [4] = {.lex_state = 138},
-  [5] = {.lex_state = 138},
-  [6] = {.lex_state = 138},
-  [7] = {.lex_state = 138},
-  [8] = {.lex_state = 138},
-  [9] = {.lex_state = 138},
-  [10] = {.lex_state = 138},
-  [11] = {.lex_state = 138},
-  [12] = {.lex_state = 138},
-  [13] = {.lex_state = 0},
-  [14] = {.lex_state = 3},
-  [15] = {.lex_state = 140},
-  [16] = {.lex_state = 3},
-  [17] = {.lex_state = 3},
-  [18] = {.lex_state = 0},
-  [19] = {.lex_state = 138},
-  [20] = {.lex_state = 0},
-  [21] = {.lex_state = 141},
-  [22] = {.lex_state = 142},
-  [23] = {.lex_state = 4},
-  [24] = {.lex_state = 4},
-  [25] = {.lex_state = 0},
-  [26] = {.lex_state = 142},
-  [27] = {.lex_state = 0},
-  [28] = {.lex_state = 141},
-  [29] = {.lex_state = 142},
-  [30] = {.lex_state = 0},
-  [31] = {.lex_state = 141},
-  [32] = {.lex_state = 141},
-  [33] = {.lex_state = 140},
-  [34] = {.lex_state = 8},
-  [35] = {.lex_state = 140},
-  [36] = {.lex_state = 140},
+  [1] = {.lex_state = 224},
+  [2] = {.lex_state = 226},
+  [3] = {.lex_state = 226},
+  [4] = {.lex_state = 223},
+  [5] = {.lex_state = 223},
+  [6] = {.lex_state = 223},
+  [7] = {.lex_state = 223},
+  [8] = {.lex_state = 223},
+  [9] = {.lex_state = 0},
+  [10] = {.lex_state = 223},
+  [11] = {.lex_state = 227},
+  [12] = {.lex_state = 2},
+  [13] = {.lex_state = 2},
+  [14] = {.lex_state = 2},
+  [15] = {.lex_state = 0},
+  [16] = {.lex_state = 225},
+  [17] = {.lex_state = 229},
+  [18] = {.lex_state = 3},
+  [19] = {.lex_state = 3},
+  [20] = {.lex_state = 225},
+  [21] = {.lex_state = 225},
+  [22] = {.lex_state = 229},
+  [23] = {.lex_state = 228},
+  [24] = {.lex_state = 228},
+  [25] = {.lex_state = 229},
+  [26] = {.lex_state = 225},
+  [27] = {.lex_state = 227},
+  [28] = {.lex_state = 228},
+  [29] = {.lex_state = 228},
+  [30] = {.lex_state = 225},
+  [31] = {.lex_state = 227},
+  [32] = {.lex_state = 227},
+  [33] = {.lex_state = 227},
+  [34] = {.lex_state = 225},
+  [35] = {.lex_state = 225},
+  [36] = {.lex_state = 227},
   [37] = {.lex_state = 0},
-  [38] = {.lex_state = 0},
-  [39] = {.lex_state = 140},
-  [40] = {.lex_state = 140},
+  [38] = {.lex_state = 225},
+  [39] = {.lex_state = 225},
+  [40] = {.lex_state = 0},
   [41] = {.lex_state = 0},
   [42] = {.lex_state = 0},
   [43] = {.lex_state = 0},
@@ -1946,67 +2225,63 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [46] = {.lex_state = 0},
   [47] = {.lex_state = 0},
   [48] = {.lex_state = 0},
-  [49] = {.lex_state = 0},
+  [49] = {.lex_state = 212},
   [50] = {.lex_state = 0},
-  [51] = {.lex_state = 0},
+  [51] = {.lex_state = 225},
   [52] = {.lex_state = 0},
-  [53] = {.lex_state = 129},
-  [54] = {.lex_state = 8},
+  [53] = {.lex_state = 0},
+  [54] = {.lex_state = 0},
   [55] = {.lex_state = 0},
-  [56] = {.lex_state = 8},
+  [56] = {.lex_state = 0},
   [57] = {.lex_state = 0},
   [58] = {.lex_state = 0},
   [59] = {.lex_state = 0},
-  [60] = {.lex_state = 10},
+  [60] = {.lex_state = 0},
   [61] = {.lex_state = 0},
   [62] = {.lex_state = 0},
   [63] = {.lex_state = 0},
   [64] = {.lex_state = 0},
-  [65] = {.lex_state = 8},
-  [66] = {.lex_state = 8},
+  [65] = {.lex_state = 0},
+  [66] = {.lex_state = 0},
   [67] = {.lex_state = 0},
   [68] = {.lex_state = 0},
   [69] = {.lex_state = 0},
   [70] = {.lex_state = 0},
   [71] = {.lex_state = 0},
-  [72] = {.lex_state = 0},
-  [73] = {.lex_state = 0},
-  [74] = {.lex_state = 0},
-  [75] = {.lex_state = 130},
+  [72] = {.lex_state = 212},
+  [73] = {.lex_state = 225},
+  [74] = {.lex_state = 213},
+  [75] = {.lex_state = 0},
   [76] = {.lex_state = 0},
   [77] = {.lex_state = 0},
-  [78] = {.lex_state = 129},
-  [79] = {.lex_state = 10},
+  [78] = {.lex_state = 50},
+  [79] = {.lex_state = 212},
   [80] = {.lex_state = 0},
   [81] = {.lex_state = 0},
   [82] = {.lex_state = 0},
-  [83] = {.lex_state = 0},
-  [84] = {.lex_state = 129},
+  [83] = {.lex_state = 225},
+  [84] = {.lex_state = 0},
   [85] = {.lex_state = 0},
   [86] = {.lex_state = 0},
-  [87] = {.lex_state = 0},
-  [88] = {.lex_state = 8},
+  [87] = {.lex_state = 50},
+  [88] = {.lex_state = 225},
   [89] = {.lex_state = 0},
   [90] = {.lex_state = 0},
   [91] = {.lex_state = 0},
-  [92] = {.lex_state = 10},
-  [93] = {.lex_state = 8},
+  [92] = {.lex_state = 0},
+  [93] = {.lex_state = 0},
   [94] = {.lex_state = 0},
   [95] = {.lex_state = 0},
   [96] = {.lex_state = 0},
   [97] = {.lex_state = 0},
-  [98] = {.lex_state = 8},
-  [99] = {.lex_state = 0},
-  [100] = {.lex_state = 0},
-  [101] = {.lex_state = 0},
-  [102] = {.lex_state = 0},
-  [103] = {.lex_state = 0},
+  [98] = {.lex_state = 0},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   [0] = {
     [ts_builtin_sym_end] = ACTIONS(1),
     [aux_sym_source_token1] = ACTIONS(1),
+    [aux_sym_comment_token1] = ACTIONS(1),
     [anon_sym_POUND] = ACTIONS(1),
     [anon_sym_Changes] = ACTIONS(1),
     [anon_sym_to] = ACTIONS(1),
@@ -2043,655 +2318,596 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_modified] = ACTIONS(1),
     [anon_sym_renamed] = ACTIONS(1),
     [anon_sym_deleted] = ACTIONS(1),
-    [anon_sym_COLON2] = ACTIONS(1),
     [anon_sym_DASH_GT] = ACTIONS(1),
     [sym_user] = ACTIONS(1),
   },
   [1] = {
-    [sym_source] = STATE(99),
-    [sym_subject] = STATE(44),
-    [sym_message] = STATE(62),
-    [sym_comment] = STATE(49),
-    [aux_sym_source_token1] = ACTIONS(3),
-    [aux_sym_subject_token1] = ACTIONS(5),
-    [aux_sym_message_token1] = ACTIONS(7),
-    [anon_sym_POUND] = ACTIONS(9),
-    [sym_user] = ACTIONS(7),
+    [sym_source] = STATE(61),
+    [sym_subject] = STATE(46),
+    [sym_comment] = STATE(46),
+    [ts_builtin_sym_end] = ACTIONS(3),
+    [aux_sym_source_token1] = ACTIONS(5),
+    [aux_sym_subject_token1] = ACTIONS(7),
+    [aux_sym_comment_token1] = ACTIONS(9),
+    [anon_sym_POUND] = ACTIONS(11),
   },
 };
 
 static const uint16_t ts_small_parse_table[] = {
   [0] = 14,
-    ACTIONS(11), 1,
-      ts_builtin_sym_end,
     ACTIONS(13), 1,
-      aux_sym_source_token1,
+      ts_builtin_sym_end,
     ACTIONS(15), 1,
-      anon_sym_Changes,
+      aux_sym_source_token1,
     ACTIONS(17), 1,
-      anon_sym_On,
+      anon_sym_Changes,
     ACTIONS(19), 1,
-      anon_sym_Your,
+      anon_sym_On,
     ACTIONS(21), 1,
-      anon_sym_You,
+      anon_sym_Your,
     ACTIONS(23), 1,
-      anon_sym_HEAD,
+      anon_sym_You,
     ACTIONS(25), 1,
-      anon_sym_Conflicts,
+      anon_sym_HEAD,
     ACTIONS(27), 1,
-      anon_sym_Untracked,
+      anon_sym_Conflicts,
     ACTIONS(29), 1,
+      anon_sym_Untracked,
+    ACTIONS(31), 1,
       sym__word,
-    STATE(28), 1,
+    STATE(24), 1,
       aux_sym__comment_body_repeat1,
-    STATE(83), 1,
+    STATE(86), 1,
       sym_header,
     STATE(91), 1,
       sym__changes_to_be_committed,
-    STATE(48), 3,
+    STATE(43), 3,
       sym__comment_body,
       sym_summary,
       sym__branch_declaration,
   [45] = 13,
-    ACTIONS(13), 1,
-      aux_sym_source_token1,
     ACTIONS(15), 1,
-      anon_sym_Changes,
+      aux_sym_source_token1,
     ACTIONS(17), 1,
-      anon_sym_On,
+      anon_sym_Changes,
     ACTIONS(19), 1,
-      anon_sym_Your,
+      anon_sym_On,
     ACTIONS(21), 1,
-      anon_sym_You,
+      anon_sym_Your,
     ACTIONS(23), 1,
-      anon_sym_HEAD,
+      anon_sym_You,
     ACTIONS(25), 1,
-      anon_sym_Conflicts,
+      anon_sym_HEAD,
     ACTIONS(27), 1,
+      anon_sym_Conflicts,
+    ACTIONS(29), 1,
       anon_sym_Untracked,
-    ACTIONS(31), 1,
+    ACTIONS(33), 1,
       sym__word,
-    STATE(32), 1,
+    STATE(29), 1,
       aux_sym__comment_body_repeat1,
-    STATE(83), 1,
+    STATE(86), 1,
       sym_header,
     STATE(91), 1,
       sym__changes_to_be_committed,
-    STATE(48), 3,
+    STATE(43), 3,
       sym__comment_body,
       sym_summary,
       sym__branch_declaration,
-  [87] = 6,
-    ACTIONS(33), 1,
-      ts_builtin_sym_end,
+  [87] = 7,
+    ACTIONS(9), 1,
+      aux_sym_comment_token1,
     ACTIONS(35), 1,
-      aux_sym_source_token1,
+      ts_builtin_sym_end,
     ACTIONS(37), 1,
+      aux_sym_source_token1,
+    ACTIONS(41), 1,
       anon_sym_POUND,
-    ACTIONS(7), 2,
+    ACTIONS(39), 2,
       aux_sym_message_token1,
       sym_user,
-    STATE(12), 2,
+    STATE(8), 2,
       sym__body_line,
       aux_sym_source_repeat1,
-    STATE(61), 2,
+    STATE(67), 2,
       sym_message,
       sym_comment,
-  [109] = 6,
-    ACTIONS(37), 1,
-      anon_sym_POUND,
-    ACTIONS(39), 1,
-      ts_builtin_sym_end,
+  [112] = 7,
+    ACTIONS(9), 1,
+      aux_sym_comment_token1,
     ACTIONS(41), 1,
-      aux_sym_source_token1,
-    ACTIONS(7), 2,
-      aux_sym_message_token1,
-      sym_user,
-    STATE(7), 2,
-      sym__body_line,
-      aux_sym_source_repeat1,
-    STATE(61), 2,
-      sym_message,
-      sym_comment,
-  [131] = 6,
-    ACTIONS(35), 1,
-      aux_sym_source_token1,
-    ACTIONS(37), 1,
       anon_sym_POUND,
     ACTIONS(43), 1,
       ts_builtin_sym_end,
-    ACTIONS(7), 2,
-      aux_sym_message_token1,
-      sym_user,
-    STATE(12), 2,
-      sym__body_line,
-      aux_sym_source_repeat1,
-    STATE(61), 2,
-      sym_message,
-      sym_comment,
-  [153] = 6,
-    ACTIONS(35), 1,
-      aux_sym_source_token1,
-    ACTIONS(37), 1,
-      anon_sym_POUND,
     ACTIONS(45), 1,
-      ts_builtin_sym_end,
-    ACTIONS(7), 2,
-      aux_sym_message_token1,
-      sym_user,
-    STATE(12), 2,
-      sym__body_line,
-      aux_sym_source_repeat1,
-    STATE(61), 2,
-      sym_message,
-      sym_comment,
-  [175] = 6,
-    ACTIONS(33), 1,
-      ts_builtin_sym_end,
-    ACTIONS(35), 1,
       aux_sym_source_token1,
-    ACTIONS(37), 1,
-      anon_sym_POUND,
-    ACTIONS(7), 2,
+    ACTIONS(39), 2,
       aux_sym_message_token1,
       sym_user,
-    STATE(12), 2,
+    STATE(6), 2,
       sym__body_line,
       aux_sym_source_repeat1,
-    STATE(61), 2,
+    STATE(67), 2,
       sym_message,
       sym_comment,
-  [197] = 6,
-    ACTIONS(33), 1,
+  [137] = 7,
+    ACTIONS(9), 1,
+      aux_sym_comment_token1,
+    ACTIONS(35), 1,
       ts_builtin_sym_end,
-    ACTIONS(37), 1,
+    ACTIONS(41), 1,
       anon_sym_POUND,
     ACTIONS(47), 1,
       aux_sym_source_token1,
-    ACTIONS(7), 2,
+    ACTIONS(39), 2,
       aux_sym_message_token1,
       sym_user,
-    STATE(6), 2,
+    STATE(7), 2,
       sym__body_line,
       aux_sym_source_repeat1,
-    STATE(61), 2,
+    STATE(67), 2,
       sym_message,
       sym_comment,
-  [219] = 6,
-    ACTIONS(37), 1,
-      anon_sym_POUND,
-    ACTIONS(45), 1,
-      ts_builtin_sym_end,
+  [162] = 7,
     ACTIONS(49), 1,
-      aux_sym_source_token1,
-    ACTIONS(7), 2,
-      aux_sym_message_token1,
-      sym_user,
-    STATE(4), 2,
-      sym__body_line,
-      aux_sym_source_repeat1,
-    STATE(61), 2,
-      sym_message,
-      sym_comment,
-  [241] = 6,
-    ACTIONS(37), 1,
-      anon_sym_POUND,
-    ACTIONS(45), 1,
       ts_builtin_sym_end,
     ACTIONS(51), 1,
       aux_sym_source_token1,
-    ACTIONS(7), 2,
+    ACTIONS(57), 1,
+      aux_sym_comment_token1,
+    ACTIONS(60), 1,
+      anon_sym_POUND,
+    ACTIONS(54), 2,
       aux_sym_message_token1,
       sym_user,
-    STATE(8), 2,
+    STATE(7), 2,
       sym__body_line,
       aux_sym_source_repeat1,
-    STATE(61), 2,
+    STATE(67), 2,
       sym_message,
       sym_comment,
-  [263] = 6,
-    ACTIONS(53), 1,
-      ts_builtin_sym_end,
-    ACTIONS(55), 1,
-      aux_sym_source_token1,
-    ACTIONS(61), 1,
+  [187] = 7,
+    ACTIONS(9), 1,
+      aux_sym_comment_token1,
+    ACTIONS(41), 1,
       anon_sym_POUND,
-    ACTIONS(58), 2,
+    ACTIONS(47), 1,
+      aux_sym_source_token1,
+    ACTIONS(63), 1,
+      ts_builtin_sym_end,
+    ACTIONS(39), 2,
       aux_sym_message_token1,
       sym_user,
-    STATE(12), 2,
+    STATE(7), 2,
       sym__body_line,
       aux_sym_source_repeat1,
-    STATE(61), 2,
+    STATE(67), 2,
       sym_message,
       sym_comment,
-  [285] = 3,
-    STATE(52), 1,
+  [212] = 3,
+    STATE(58), 1,
       sym_change,
-    ACTIONS(64), 2,
+    ACTIONS(65), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-    ACTIONS(66), 4,
+    ACTIONS(67), 4,
       anon_sym_newfile,
       anon_sym_modified,
       anon_sym_renamed,
       anon_sym_deleted,
-  [299] = 3,
-    ACTIONS(68), 1,
+  [226] = 2,
+    ACTIONS(69), 1,
+      ts_builtin_sym_end,
+    ACTIONS(71), 5,
       aux_sym_source_token1,
-    STATE(17), 1,
-      aux_sym_message_repeat1,
-    ACTIONS(70), 3,
-      sym__word,
+      aux_sym_message_token1,
+      aux_sym_comment_token1,
+      anon_sym_POUND,
       sym_user,
-      sym_item,
-  [311] = 5,
-    ACTIONS(64), 1,
+  [237] = 5,
+    ACTIONS(65), 1,
       ts_builtin_sym_end,
-    ACTIONS(72), 1,
+    ACTIONS(73), 1,
       aux_sym_source_token1,
-    ACTIONS(74), 1,
+    ACTIONS(75), 1,
       aux_sym_path_token1,
-    STATE(40), 1,
+    STATE(27), 1,
       aux_sym_path_repeat1,
-    STATE(64), 1,
+    STATE(59), 1,
       sym_path,
-  [327] = 3,
-    ACTIONS(76), 1,
+  [253] = 3,
+    ACTIONS(77), 1,
       aux_sym_source_token1,
-    STATE(16), 1,
+    STATE(13), 1,
       aux_sym_message_repeat1,
-    ACTIONS(78), 3,
+    ACTIONS(79), 3,
       sym__word,
       sym_user,
       sym_item,
-  [339] = 3,
+  [265] = 3,
     ACTIONS(81), 1,
       aux_sym_source_token1,
-    STATE(16), 1,
+    STATE(14), 1,
       aux_sym_message_repeat1,
     ACTIONS(83), 3,
       sym__word,
       sym_user,
       sym_item,
-  [351] = 2,
-    STATE(52), 1,
+  [277] = 3,
+    ACTIONS(85), 1,
+      aux_sym_source_token1,
+    STATE(14), 1,
+      aux_sym_message_repeat1,
+    ACTIONS(87), 3,
+      sym__word,
+      sym_user,
+      sym_item,
+  [289] = 2,
+    STATE(58), 1,
       sym_change,
-    ACTIONS(66), 4,
+    ACTIONS(67), 4,
       anon_sym_newfile,
       anon_sym_modified,
       anon_sym_renamed,
       anon_sym_deleted,
-  [361] = 2,
-    ACTIONS(85), 1,
-      ts_builtin_sym_end,
-    ACTIONS(87), 4,
-      aux_sym_source_token1,
-      aux_sym_message_token1,
-      anon_sym_POUND,
-      sym_user,
-  [371] = 3,
-    ACTIONS(91), 1,
+  [299] = 3,
+    ACTIONS(92), 1,
       anon_sym_POUND,
-    STATE(30), 1,
+    STATE(26), 1,
       aux_sym_summary_repeat2,
-    ACTIONS(89), 2,
-      ts_builtin_sym_end,
-      aux_sym_source_token1,
-  [382] = 4,
-    ACTIONS(93), 1,
+    ACTIONS(90), 2,
       ts_builtin_sym_end,
-    ACTIONS(95), 1,
       aux_sym_source_token1,
-    ACTIONS(97), 1,
-      sym__word,
-    STATE(21), 1,
-      aux_sym__comment_body_repeat1,
-  [395] = 4,
-    ACTIONS(100), 1,
+  [310] = 4,
+    ACTIONS(94), 1,
       ts_builtin_sym_end,
-    ACTIONS(102), 1,
+    ACTIONS(96), 1,
       aux_sym_source_token1,
-    ACTIONS(104), 1,
+    ACTIONS(98), 1,
       aux_sym_subject_token2,
-    STATE(29), 1,
+    STATE(25), 1,
       aux_sym_subject_repeat1,
-  [408] = 3,
-    ACTIONS(108), 1,
+  [323] = 3,
+    ACTIONS(102), 1,
       aux_sym_path_token1,
-    STATE(23), 1,
+    STATE(18), 1,
       aux_sym_path_repeat1,
-    ACTIONS(106), 2,
+    ACTIONS(100), 2,
       aux_sym_source_token1,
       anon_sym_DASH_GT,
-  [419] = 3,
-    ACTIONS(113), 1,
+  [334] = 3,
+    ACTIONS(107), 1,
       aux_sym_path_token1,
-    STATE(23), 1,
+    STATE(18), 1,
       aux_sym_path_repeat1,
-    ACTIONS(111), 2,
+    ACTIONS(105), 2,
       aux_sym_source_token1,
       anon_sym_DASH_GT,
-  [430] = 3,
-    ACTIONS(115), 1,
+  [345] = 3,
+    ACTIONS(109), 1,
       anon_sym_POUND,
-    STATE(27), 1,
+    STATE(21), 1,
+      aux_sym_summary_repeat1,
+    ACTIONS(90), 2,
+      ts_builtin_sym_end,
+      aux_sym_source_token1,
+  [356] = 3,
+    ACTIONS(113), 1,
+      anon_sym_POUND,
+    STATE(21), 1,
       aux_sym_summary_repeat1,
-    ACTIONS(89), 2,
+    ACTIONS(111), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-  [441] = 4,
-    ACTIONS(117), 1,
+  [367] = 4,
+    ACTIONS(116), 1,
       ts_builtin_sym_end,
-    ACTIONS(119), 1,
+    ACTIONS(118), 1,
       aux_sym_source_token1,
-    ACTIONS(121), 1,
+    ACTIONS(120), 1,
       aux_sym_subject_token2,
-    STATE(22), 1,
+    STATE(17), 1,
       aux_sym_subject_repeat1,
-  [454] = 3,
-    ACTIONS(125), 1,
-      anon_sym_POUND,
-    STATE(27), 1,
-      aux_sym_summary_repeat1,
-    ACTIONS(123), 2,
+  [380] = 4,
+    ACTIONS(122), 1,
       ts_builtin_sym_end,
+    ACTIONS(124), 1,
       aux_sym_source_token1,
-  [465] = 4,
-    ACTIONS(128), 1,
+    ACTIONS(126), 1,
+      sym__word,
+    STATE(23), 1,
+      aux_sym__comment_body_repeat1,
+  [393] = 4,
+    ACTIONS(129), 1,
       ts_builtin_sym_end,
-    ACTIONS(130), 1,
+    ACTIONS(131), 1,
       aux_sym_source_token1,
-    ACTIONS(132), 1,
+    ACTIONS(133), 1,
       sym__word,
-    STATE(21), 1,
+    STATE(23), 1,
       aux_sym__comment_body_repeat1,
-  [478] = 4,
-    ACTIONS(134), 1,
+  [406] = 4,
+    ACTIONS(135), 1,
       ts_builtin_sym_end,
-    ACTIONS(136), 1,
+    ACTIONS(137), 1,
       aux_sym_source_token1,
-    ACTIONS(138), 1,
+    ACTIONS(139), 1,
       aux_sym_subject_token2,
-    STATE(29), 1,
+    STATE(25), 1,
       aux_sym_subject_repeat1,
-  [491] = 3,
-    ACTIONS(143), 1,
+  [419] = 3,
+    ACTIONS(144), 1,
       anon_sym_POUND,
-    STATE(30), 1,
+    STATE(26), 1,
       aux_sym_summary_repeat2,
-    ACTIONS(141), 2,
+    ACTIONS(142), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-  [502] = 3,
-    ACTIONS(95), 1,
+  [430] = 3,
+    ACTIONS(105), 1,
+      aux_sym_source_token1,
+    ACTIONS(147), 1,
+      aux_sym_path_token1,
+    STATE(33), 1,
+      aux_sym_path_repeat1,
+  [440] = 3,
+    ACTIONS(124), 1,
       aux_sym_source_token1,
-    ACTIONS(146), 1,
+    ACTIONS(149), 1,
       sym__word,
-    STATE(31), 1,
+    STATE(28), 1,
       aux_sym__comment_body_repeat1,
-  [512] = 3,
-    ACTIONS(130), 1,
+  [450] = 3,
+    ACTIONS(131), 1,
       aux_sym_source_token1,
-    ACTIONS(149), 1,
+    ACTIONS(152), 1,
       sym__word,
-    STATE(31), 1,
+    STATE(28), 1,
       aux_sym__comment_body_repeat1,
-  [522] = 3,
-    ACTIONS(74), 1,
-      aux_sym_path_token1,
-    STATE(40), 1,
-      aux_sym_path_repeat1,
-    STATE(64), 1,
-      sym_path,
-  [532] = 2,
-    ACTIONS(151), 1,
+  [460] = 2,
+    ACTIONS(154), 1,
       anon_sym_up,
-    ACTIONS(153), 2,
+    ACTIONS(156), 2,
       anon_sym_ahead,
       anon_sym_behind,
-  [540] = 3,
-    ACTIONS(74), 1,
+  [468] = 3,
+    ACTIONS(75), 1,
+      aux_sym_path_token1,
+    STATE(27), 1,
+      aux_sym_path_repeat1,
+    STATE(82), 1,
+      sym_path,
+  [478] = 3,
+    ACTIONS(75), 1,
       aux_sym_path_token1,
-    STATE(40), 1,
+    STATE(27), 1,
       aux_sym_path_repeat1,
-    STATE(87), 1,
+    STATE(59), 1,
       sym_path,
-  [550] = 3,
-    ACTIONS(106), 1,
+  [488] = 3,
+    ACTIONS(100), 1,
       aux_sym_source_token1,
-    ACTIONS(155), 1,
+    ACTIONS(158), 1,
       aux_sym_path_token1,
-    STATE(36), 1,
+    STATE(33), 1,
       aux_sym_path_repeat1,
-  [560] = 1,
-    ACTIONS(158), 3,
+  [498] = 1,
+    ACTIONS(161), 3,
       ts_builtin_sym_end,
       aux_sym_source_token1,
       anon_sym_POUND,
-  [566] = 1,
-    ACTIONS(160), 3,
+  [504] = 1,
+    ACTIONS(163), 3,
       ts_builtin_sym_end,
       aux_sym_source_token1,
       anon_sym_POUND,
-  [572] = 3,
-    ACTIONS(162), 1,
+  [510] = 3,
+    ACTIONS(165), 1,
       aux_sym_path_token1,
-    STATE(24), 1,
+    STATE(19), 1,
       aux_sym_path_repeat1,
-    STATE(47), 1,
+    STATE(37), 1,
       sym_path,
-  [582] = 3,
-    ACTIONS(111), 1,
-      aux_sym_source_token1,
-    ACTIONS(164), 1,
-      aux_sym_path_token1,
-    STATE(36), 1,
-      aux_sym_path_repeat1,
-  [592] = 1,
-    ACTIONS(166), 2,
-      ts_builtin_sym_end,
+  [520] = 2,
+    ACTIONS(167), 1,
       aux_sym_source_token1,
-  [597] = 2,
-    ACTIONS(168), 1,
+    ACTIONS(169), 1,
+      anon_sym_DASH_GT,
+  [527] = 2,
+    ACTIONS(171), 1,
       anon_sym_POUND,
-    STATE(25), 1,
+    STATE(20), 1,
       aux_sym_summary_repeat1,
-  [604] = 2,
-    ACTIONS(170), 1,
+  [534] = 2,
+    ACTIONS(173), 1,
       anon_sym_POUND,
-    STATE(20), 1,
+    STATE(16), 1,
       aux_sym_summary_repeat2,
-  [611] = 2,
-    ACTIONS(39), 1,
+  [541] = 1,
+    ACTIONS(13), 2,
       ts_builtin_sym_end,
-    ACTIONS(172), 1,
       aux_sym_source_token1,
-  [618] = 1,
-    ACTIONS(174), 2,
+  [546] = 1,
+    ACTIONS(175), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-  [623] = 1,
-    ACTIONS(176), 2,
+  [551] = 1,
+    ACTIONS(177), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-  [628] = 2,
-    ACTIONS(178), 1,
+  [556] = 1,
+    ACTIONS(179), 2,
+      ts_builtin_sym_end,
       aux_sym_source_token1,
-    ACTIONS(180), 1,
-      anon_sym_DASH_GT,
-  [635] = 1,
-    ACTIONS(182), 2,
+  [561] = 1,
+    ACTIONS(181), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-  [640] = 2,
-    ACTIONS(39), 1,
+  [566] = 1,
+    ACTIONS(183), 2,
       ts_builtin_sym_end,
-    ACTIONS(184), 1,
       aux_sym_source_token1,
-  [647] = 1,
-    ACTIONS(186), 2,
+  [571] = 2,
+    ACTIONS(43), 1,
       ts_builtin_sym_end,
+    ACTIONS(185), 1,
       aux_sym_source_token1,
-  [652] = 1,
-    ACTIONS(188), 2,
+  [578] = 1,
+    ACTIONS(187), 2,
       ts_builtin_sym_end,
       aux_sym_source_token1,
-  [657] = 1,
-    ACTIONS(190), 1,
+  [583] = 1,
+    ACTIONS(189), 1,
       aux_sym_source_token1,
-  [661] = 1,
-    ACTIONS(192), 1,
+  [587] = 1,
+    ACTIONS(191), 1,
       sym_branch,
-  [665] = 1,
-    ACTIONS(194), 1,
+  [591] = 1,
+    ACTIONS(193), 1,
+      anon_sym_rebasing,
+  [595] = 1,
+    ACTIONS(195), 1,
       sym_commit,
-  [669] = 1,
-    ACTIONS(196), 1,
+  [599] = 1,
+    ACTIONS(197), 1,
       aux_sym_source_token1,
-  [673] = 1,
-    ACTIONS(198), 1,
+  [603] = 1,
+    ACTIONS(199), 1,
       anon_sym_COLON,
-  [677] = 1,
-    ACTIONS(200), 1,
+  [607] = 1,
+    ACTIONS(201), 1,
       anon_sym_to,
-  [681] = 1,
-    ACTIONS(202), 1,
+  [611] = 1,
+    ACTIONS(203), 1,
       anon_sym_of,
-  [685] = 1,
-    ACTIONS(204), 1,
+  [615] = 1,
+    ACTIONS(205), 1,
       anon_sym_branch,
-  [689] = 1,
-    ACTIONS(206), 1,
-      anon_sym_COLON2,
-  [693] = 1,
-    ACTIONS(208), 1,
+  [619] = 1,
+    ACTIONS(207), 1,
+      anon_sym_COLON,
+  [623] = 1,
+    ACTIONS(209), 1,
       aux_sym_source_token1,
-  [697] = 1,
-    ACTIONS(184), 1,
+  [627] = 1,
+    ACTIONS(211), 1,
       aux_sym_source_token1,
-  [701] = 1,
-    ACTIONS(210), 1,
+  [631] = 1,
+    ACTIONS(213), 1,
       anon_sym_to,
-  [705] = 1,
-    ACTIONS(212), 1,
-      aux_sym_source_token1,
-  [709] = 1,
-    ACTIONS(214), 1,
-      anon_sym_committed,
-  [713] = 1,
-    ACTIONS(216), 1,
+  [635] = 1,
+    ACTIONS(215), 1,
+      ts_builtin_sym_end,
+  [639] = 1,
+    ACTIONS(217), 1,
       anon_sym_COLON,
-  [717] = 1,
-    ACTIONS(218), 1,
+  [643] = 1,
+    ACTIONS(219), 1,
       aux_sym_source_token1,
-  [721] = 1,
-    ACTIONS(220), 1,
-      aux_sym_source_token1,
-  [725] = 1,
-    ACTIONS(222), 1,
+  [647] = 1,
+    ACTIONS(221), 1,
       anon_sym_date,
-  [729] = 1,
-    ACTIONS(224), 1,
+  [651] = 1,
+    ACTIONS(223), 1,
       anon_sym_SQUOTE,
-  [733] = 1,
-    ACTIONS(226), 1,
+  [655] = 1,
+    ACTIONS(225), 1,
       anon_sym_SQUOTE,
-  [737] = 1,
-    ACTIONS(228), 1,
+  [659] = 1,
+    ACTIONS(227), 1,
+      aux_sym_source_token1,
+  [663] = 1,
+    ACTIONS(229), 1,
       anon_sym_at,
-  [741] = 1,
-    ACTIONS(230), 1,
+  [667] = 1,
+    ACTIONS(231), 1,
       anon_sym_currently,
-  [745] = 1,
-    ACTIONS(232), 1,
+  [671] = 1,
+    ACTIONS(233), 1,
       anon_sym_is,
-  [749] = 1,
-    ACTIONS(234), 1,
-      sym__word,
-  [753] = 1,
-    ACTIONS(236), 1,
+  [675] = 1,
+    ACTIONS(235), 1,
       anon_sym_with,
-  [757] = 1,
-    ACTIONS(238), 1,
-      anon_sym_rebasing,
-  [761] = 1,
-    ACTIONS(240), 1,
+  [679] = 1,
+    ACTIONS(237), 1,
       sym_branch,
-  [765] = 1,
-    ACTIONS(242), 1,
-      anon_sym_be,
-  [769] = 1,
-    ACTIONS(244), 1,
+  [683] = 1,
+    ACTIONS(239), 1,
+      anon_sym_committed,
+  [687] = 1,
+    ACTIONS(241), 1,
+      sym__word,
+  [691] = 1,
+    ACTIONS(243), 1,
       anon_sym_SQUOTE,
-  [773] = 1,
-    ACTIONS(246), 1,
+  [695] = 1,
+    ACTIONS(245), 1,
       anon_sym_SQUOTE,
-  [777] = 1,
-    ACTIONS(248), 1,
+  [699] = 1,
+    ACTIONS(247), 1,
       anon_sym_SQUOTE,
-  [781] = 1,
-    ACTIONS(250), 1,
-      aux_sym_source_token1,
-  [785] = 1,
-    ACTIONS(252), 1,
+  [703] = 1,
+    ACTIONS(249), 1,
+      anon_sym_be,
+  [707] = 1,
+    ACTIONS(251), 1,
       sym_branch,
-  [789] = 1,
-    ACTIONS(254), 1,
+  [711] = 1,
+    ACTIONS(253), 1,
       anon_sym_by,
-  [793] = 1,
-    ACTIONS(256), 1,
+  [715] = 1,
+    ACTIONS(255), 1,
       anon_sym_on,
-  [797] = 1,
-    ACTIONS(258), 1,
+  [719] = 1,
+    ACTIONS(257), 1,
       aux_sym_source_token1,
-  [801] = 1,
-    ACTIONS(260), 1,
+  [723] = 1,
+    ACTIONS(259), 1,
       anon_sym_SQUOTE_DOT,
-  [805] = 1,
-    ACTIONS(262), 1,
+  [727] = 1,
+    ACTIONS(261), 1,
       aux_sym__branch_declaration_token1,
-  [809] = 1,
-    ACTIONS(264), 1,
+  [731] = 1,
+    ACTIONS(263), 1,
       anon_sym_SQUOTE,
-  [813] = 1,
-    ACTIONS(266), 1,
+  [735] = 1,
+    ACTIONS(265), 1,
       aux_sym_source_token1,
-  [817] = 1,
-    ACTIONS(268), 1,
+  [739] = 1,
+    ACTIONS(267), 1,
       aux_sym__branch_declaration_token2,
-  [821] = 1,
-    ACTIONS(270), 1,
+  [743] = 1,
+    ACTIONS(269), 1,
       sym_commit,
-  [825] = 1,
-    ACTIONS(272), 1,
+  [747] = 1,
+    ACTIONS(271), 1,
       anon_sym_DOT,
-  [829] = 1,
-    ACTIONS(274), 1,
+  [751] = 1,
+    ACTIONS(273), 1,
       anon_sym_SQUOTE,
-  [833] = 1,
-    ACTIONS(276), 1,
-      anon_sym_files,
-  [837] = 1,
-    ACTIONS(278), 1,
+  [755] = 1,
+    ACTIONS(275), 1,
+      aux_sym_source_token1,
+  [759] = 1,
+    ACTIONS(277), 1,
       anon_sym_DOT,
-  [841] = 1,
-    ACTIONS(280), 1,
+  [763] = 1,
+    ACTIONS(279), 1,
+      anon_sym_files,
+  [767] = 1,
+    ACTIONS(281), 1,
       anon_sym_COLON,
-  [845] = 1,
-    ACTIONS(282), 1,
-      ts_builtin_sym_end,
-  [849] = 1,
-    ACTIONS(284), 1,
+  [771] = 1,
+    ACTIONS(283), 1,
       anon_sym_detached,
-  [853] = 1,
-    ACTIONS(286), 1,
+  [775] = 1,
+    ACTIONS(285), 1,
       anon_sym_are,
-  [857] = 1,
-    ACTIONS(288), 1,
+  [779] = 1,
+    ACTIONS(287), 1,
       anon_sym_branch,
-  [861] = 1,
-    ACTIONS(290), 1,
+  [783] = 1,
+    ACTIONS(289), 1,
       anon_sym_branch,
 };
 
@@ -2699,249 +2915,243 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(2)] = 0,
   [SMALL_STATE(3)] = 45,
   [SMALL_STATE(4)] = 87,
-  [SMALL_STATE(5)] = 109,
-  [SMALL_STATE(6)] = 131,
-  [SMALL_STATE(7)] = 153,
-  [SMALL_STATE(8)] = 175,
-  [SMALL_STATE(9)] = 197,
-  [SMALL_STATE(10)] = 219,
-  [SMALL_STATE(11)] = 241,
-  [SMALL_STATE(12)] = 263,
-  [SMALL_STATE(13)] = 285,
-  [SMALL_STATE(14)] = 299,
-  [SMALL_STATE(15)] = 311,
-  [SMALL_STATE(16)] = 327,
-  [SMALL_STATE(17)] = 339,
-  [SMALL_STATE(18)] = 351,
-  [SMALL_STATE(19)] = 361,
-  [SMALL_STATE(20)] = 371,
-  [SMALL_STATE(21)] = 382,
-  [SMALL_STATE(22)] = 395,
-  [SMALL_STATE(23)] = 408,
-  [SMALL_STATE(24)] = 419,
-  [SMALL_STATE(25)] = 430,
-  [SMALL_STATE(26)] = 441,
-  [SMALL_STATE(27)] = 454,
-  [SMALL_STATE(28)] = 465,
-  [SMALL_STATE(29)] = 478,
-  [SMALL_STATE(30)] = 491,
-  [SMALL_STATE(31)] = 502,
-  [SMALL_STATE(32)] = 512,
-  [SMALL_STATE(33)] = 522,
-  [SMALL_STATE(34)] = 532,
-  [SMALL_STATE(35)] = 540,
-  [SMALL_STATE(36)] = 550,
-  [SMALL_STATE(37)] = 560,
-  [SMALL_STATE(38)] = 566,
-  [SMALL_STATE(39)] = 572,
-  [SMALL_STATE(40)] = 582,
-  [SMALL_STATE(41)] = 592,
-  [SMALL_STATE(42)] = 597,
-  [SMALL_STATE(43)] = 604,
-  [SMALL_STATE(44)] = 611,
-  [SMALL_STATE(45)] = 618,
-  [SMALL_STATE(46)] = 623,
-  [SMALL_STATE(47)] = 628,
-  [SMALL_STATE(48)] = 635,
-  [SMALL_STATE(49)] = 640,
-  [SMALL_STATE(50)] = 647,
-  [SMALL_STATE(51)] = 652,
-  [SMALL_STATE(52)] = 657,
-  [SMALL_STATE(53)] = 661,
-  [SMALL_STATE(54)] = 665,
-  [SMALL_STATE(55)] = 669,
-  [SMALL_STATE(56)] = 673,
-  [SMALL_STATE(57)] = 677,
-  [SMALL_STATE(58)] = 681,
-  [SMALL_STATE(59)] = 685,
-  [SMALL_STATE(60)] = 689,
-  [SMALL_STATE(61)] = 693,
-  [SMALL_STATE(62)] = 697,
-  [SMALL_STATE(63)] = 701,
-  [SMALL_STATE(64)] = 705,
-  [SMALL_STATE(65)] = 709,
-  [SMALL_STATE(66)] = 713,
-  [SMALL_STATE(67)] = 717,
-  [SMALL_STATE(68)] = 721,
-  [SMALL_STATE(69)] = 725,
-  [SMALL_STATE(70)] = 729,
-  [SMALL_STATE(71)] = 733,
-  [SMALL_STATE(72)] = 737,
-  [SMALL_STATE(73)] = 741,
-  [SMALL_STATE(74)] = 745,
-  [SMALL_STATE(75)] = 749,
-  [SMALL_STATE(76)] = 753,
-  [SMALL_STATE(77)] = 757,
-  [SMALL_STATE(78)] = 761,
-  [SMALL_STATE(79)] = 765,
-  [SMALL_STATE(80)] = 769,
-  [SMALL_STATE(81)] = 773,
-  [SMALL_STATE(82)] = 777,
-  [SMALL_STATE(83)] = 781,
-  [SMALL_STATE(84)] = 785,
-  [SMALL_STATE(85)] = 789,
-  [SMALL_STATE(86)] = 793,
-  [SMALL_STATE(87)] = 797,
-  [SMALL_STATE(88)] = 801,
-  [SMALL_STATE(89)] = 805,
-  [SMALL_STATE(90)] = 809,
-  [SMALL_STATE(91)] = 813,
-  [SMALL_STATE(92)] = 817,
-  [SMALL_STATE(93)] = 821,
-  [SMALL_STATE(94)] = 825,
-  [SMALL_STATE(95)] = 829,
-  [SMALL_STATE(96)] = 833,
-  [SMALL_STATE(97)] = 837,
-  [SMALL_STATE(98)] = 841,
-  [SMALL_STATE(99)] = 845,
-  [SMALL_STATE(100)] = 849,
-  [SMALL_STATE(101)] = 853,
-  [SMALL_STATE(102)] = 857,
-  [SMALL_STATE(103)] = 861,
+  [SMALL_STATE(5)] = 112,
+  [SMALL_STATE(6)] = 137,
+  [SMALL_STATE(7)] = 162,
+  [SMALL_STATE(8)] = 187,
+  [SMALL_STATE(9)] = 212,
+  [SMALL_STATE(10)] = 226,
+  [SMALL_STATE(11)] = 237,
+  [SMALL_STATE(12)] = 253,
+  [SMALL_STATE(13)] = 265,
+  [SMALL_STATE(14)] = 277,
+  [SMALL_STATE(15)] = 289,
+  [SMALL_STATE(16)] = 299,
+  [SMALL_STATE(17)] = 310,
+  [SMALL_STATE(18)] = 323,
+  [SMALL_STATE(19)] = 334,
+  [SMALL_STATE(20)] = 345,
+  [SMALL_STATE(21)] = 356,
+  [SMALL_STATE(22)] = 367,
+  [SMALL_STATE(23)] = 380,
+  [SMALL_STATE(24)] = 393,
+  [SMALL_STATE(25)] = 406,
+  [SMALL_STATE(26)] = 419,
+  [SMALL_STATE(27)] = 430,
+  [SMALL_STATE(28)] = 440,
+  [SMALL_STATE(29)] = 450,
+  [SMALL_STATE(30)] = 460,
+  [SMALL_STATE(31)] = 468,
+  [SMALL_STATE(32)] = 478,
+  [SMALL_STATE(33)] = 488,
+  [SMALL_STATE(34)] = 498,
+  [SMALL_STATE(35)] = 504,
+  [SMALL_STATE(36)] = 510,
+  [SMALL_STATE(37)] = 520,
+  [SMALL_STATE(38)] = 527,
+  [SMALL_STATE(39)] = 534,
+  [SMALL_STATE(40)] = 541,
+  [SMALL_STATE(41)] = 546,
+  [SMALL_STATE(42)] = 551,
+  [SMALL_STATE(43)] = 556,
+  [SMALL_STATE(44)] = 561,
+  [SMALL_STATE(45)] = 566,
+  [SMALL_STATE(46)] = 571,
+  [SMALL_STATE(47)] = 578,
+  [SMALL_STATE(48)] = 583,
+  [SMALL_STATE(49)] = 587,
+  [SMALL_STATE(50)] = 591,
+  [SMALL_STATE(51)] = 595,
+  [SMALL_STATE(52)] = 599,
+  [SMALL_STATE(53)] = 603,
+  [SMALL_STATE(54)] = 607,
+  [SMALL_STATE(55)] = 611,
+  [SMALL_STATE(56)] = 615,
+  [SMALL_STATE(57)] = 619,
+  [SMALL_STATE(58)] = 623,
+  [SMALL_STATE(59)] = 627,
+  [SMALL_STATE(60)] = 631,
+  [SMALL_STATE(61)] = 635,
+  [SMALL_STATE(62)] = 639,
+  [SMALL_STATE(63)] = 643,
+  [SMALL_STATE(64)] = 647,
+  [SMALL_STATE(65)] = 651,
+  [SMALL_STATE(66)] = 655,
+  [SMALL_STATE(67)] = 659,
+  [SMALL_STATE(68)] = 663,
+  [SMALL_STATE(69)] = 667,
+  [SMALL_STATE(70)] = 671,
+  [SMALL_STATE(71)] = 675,
+  [SMALL_STATE(72)] = 679,
+  [SMALL_STATE(73)] = 683,
+  [SMALL_STATE(74)] = 687,
+  [SMALL_STATE(75)] = 691,
+  [SMALL_STATE(76)] = 695,
+  [SMALL_STATE(77)] = 699,
+  [SMALL_STATE(78)] = 703,
+  [SMALL_STATE(79)] = 707,
+  [SMALL_STATE(80)] = 711,
+  [SMALL_STATE(81)] = 715,
+  [SMALL_STATE(82)] = 719,
+  [SMALL_STATE(83)] = 723,
+  [SMALL_STATE(84)] = 727,
+  [SMALL_STATE(85)] = 731,
+  [SMALL_STATE(86)] = 735,
+  [SMALL_STATE(87)] = 739,
+  [SMALL_STATE(88)] = 743,
+  [SMALL_STATE(89)] = 747,
+  [SMALL_STATE(90)] = 751,
+  [SMALL_STATE(91)] = 755,
+  [SMALL_STATE(92)] = 759,
+  [SMALL_STATE(93)] = 763,
+  [SMALL_STATE(94)] = 767,
+  [SMALL_STATE(95)] = 771,
+  [SMALL_STATE(96)] = 775,
+  [SMALL_STATE(97)] = 779,
+  [SMALL_STATE(98)] = 783,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
-  [3] = {.entry = {.count = 1, .reusable = false}}, SHIFT(5),
-  [5] = {.entry = {.count = 1, .reusable = false}}, SHIFT(26),
-  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(14),
-  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(2),
-  [11] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 1),
-  [13] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comment, 1),
-  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(63),
-  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(103),
-  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(102),
-  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(101),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(100),
-  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(98),
-  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(96),
-  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(28),
-  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(32),
-  [33] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 3),
-  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(12),
-  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(3),
-  [39] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 1),
-  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(7),
-  [43] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 4),
-  [45] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 2),
-  [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(6),
-  [49] = {.entry = {.count = 1, .reusable = false}}, SHIFT(9),
-  [51] = {.entry = {.count = 1, .reusable = false}}, SHIFT(8),
-  [53] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2),
-  [55] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(12),
-  [58] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(14),
-  [61] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(3),
-  [64] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_summary, 4),
-  [66] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [68] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_message, 1),
-  [70] = {.entry = {.count = 1, .reusable = false}}, SHIFT(17),
-  [72] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_summary, 4),
-  [74] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [76] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_message_repeat1, 2),
-  [78] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_message_repeat1, 2), SHIFT_REPEAT(16),
+  [3] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 0),
+  [5] = {.entry = {.count = 1, .reusable = false}}, SHIFT(5),
+  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(40),
+  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(2),
+  [13] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 1),
+  [15] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_comment, 1),
+  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(60),
+  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(98),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(97),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(96),
+  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(95),
+  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(94),
+  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(93),
+  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(24),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(29),
+  [35] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 2),
+  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(8),
+  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(12),
+  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(3),
+  [43] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 1),
+  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(6),
+  [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(7),
+  [49] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_repeat1, 2),
+  [51] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(7),
+  [54] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(12),
+  [57] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(40),
+  [60] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_repeat1, 2), SHIFT_REPEAT(3),
+  [63] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source, 3),
+  [65] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_summary, 4),
+  [67] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [69] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__body_line, 2),
+  [71] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__body_line, 2),
+  [73] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_summary, 4),
+  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [77] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_message, 1),
+  [79] = {.entry = {.count = 1, .reusable = false}}, SHIFT(13),
   [81] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_message, 2),
-  [83] = {.entry = {.count = 1, .reusable = false}}, SHIFT(16),
-  [85] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__body_line, 2),
-  [87] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__body_line, 2),
-  [89] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_summary, 3),
-  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [93] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__comment_body_repeat1, 2),
-  [95] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__comment_body_repeat1, 2),
-  [97] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__comment_body_repeat1, 2), SHIFT_REPEAT(21),
-  [100] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subject, 2),
-  [102] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subject, 2),
-  [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [106] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_path_repeat1, 2),
-  [108] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_path_repeat1, 2), SHIFT_REPEAT(23),
-  [111] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_path, 1),
-  [113] = {.entry = {.count = 1, .reusable = false}}, SHIFT(23),
-  [115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subject, 1),
-  [119] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subject, 1),
-  [121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat1, 2),
-  [125] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_summary_repeat1, 2), SHIFT_REPEAT(18),
-  [128] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comment_body, 1),
-  [130] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__comment_body, 1),
-  [132] = {.entry = {.count = 1, .reusable = false}}, SHIFT(21),
-  [134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_subject_repeat1, 2),
-  [136] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_subject_repeat1, 2),
-  [138] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_subject_repeat1, 2), SHIFT_REPEAT(29),
-  [141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat2, 2),
-  [143] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_summary_repeat2, 2), SHIFT_REPEAT(33),
-  [146] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__comment_body_repeat1, 2), SHIFT_REPEAT(31),
-  [149] = {.entry = {.count = 1, .reusable = false}}, SHIFT(31),
-  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [155] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_path_repeat1, 2), SHIFT_REPEAT(36),
-  [158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat2, 3),
-  [160] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat1, 3),
-  [162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 12),
-  [168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [174] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 13),
-  [176] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 3, .production_id = 1),
-  [178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_change, 3, .production_id = 2),
-  [180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [182] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2),
-  [184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 4),
-  [188] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 10),
-  [190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_header, 3),
-  [198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [210] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [212] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [214] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [216] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [218] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_header, 2),
-  [220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__changes_to_be_committed, 5),
-  [222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [236] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [238] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [240] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [242] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_change, 5, .production_id = 2),
-  [260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
-  [282] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [83] = {.entry = {.count = 1, .reusable = false}}, SHIFT(14),
+  [85] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_message_repeat1, 2),
+  [87] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_message_repeat1, 2), SHIFT_REPEAT(14),
+  [90] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_summary, 3),
+  [92] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
+  [94] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subject, 2),
+  [96] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subject, 2),
+  [98] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [100] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_path_repeat1, 2),
+  [102] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_path_repeat1, 2), SHIFT_REPEAT(18),
+  [105] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_path, 1),
+  [107] = {.entry = {.count = 1, .reusable = false}}, SHIFT(18),
+  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [111] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat1, 2),
+  [113] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_summary_repeat1, 2), SHIFT_REPEAT(15),
+  [116] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subject, 1),
+  [118] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subject, 1),
+  [120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [122] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__comment_body_repeat1, 2),
+  [124] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__comment_body_repeat1, 2),
+  [126] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__comment_body_repeat1, 2), SHIFT_REPEAT(23),
+  [129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comment_body, 1),
+  [131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__comment_body, 1),
+  [133] = {.entry = {.count = 1, .reusable = false}}, SHIFT(23),
+  [135] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_subject_repeat1, 2),
+  [137] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_subject_repeat1, 2),
+  [139] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_subject_repeat1, 2), SHIFT_REPEAT(25),
+  [142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat2, 2),
+  [144] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_summary_repeat2, 2), SHIFT_REPEAT(32),
+  [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [149] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__comment_body_repeat1, 2), SHIFT_REPEAT(28),
+  [152] = {.entry = {.count = 1, .reusable = false}}, SHIFT(28),
+  [154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [158] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_path_repeat1, 2), SHIFT_REPEAT(33),
+  [161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat2, 3),
+  [163] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_summary_repeat1, 3),
+  [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_change, 3, .production_id = 2),
+  [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [175] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 10),
+  [177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 3, .production_id = 1),
+  [179] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2),
+  [181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 12),
+  [183] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 4),
+  [185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [187] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__branch_declaration, 13),
+  [189] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_header, 2),
+  [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [197] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_header, 3),
+  [199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
+  [201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [215] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [219] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__changes_to_be_committed, 5),
+  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_change, 5, .production_id = 2),
+  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
+  [265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [283] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
+  [289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
 };
 
 #ifdef __cplusplus
diff --git a/test/corpus/comments.txt b/test/corpus/comments.txt
index 344e618..8402313 100644
--- a/test/corpus/comments.txt
+++ b/test/corpus/comments.txt
@@ -106,6 +106,17 @@ Rebasing branch onto commit
 
 (source (comment (branch) (commit)))
 
+=====================================
+Scissors
+=====================================
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+
+---
+
+(source (comment (scissors)))
+
 =====================================
 Verbose ammend commit with diff
 =====================================
@@ -114,12 +125,7 @@ Verbose ammend commit with diff
 #
 # Date:      Thu Dec 23 08:06:48 2021 -0600
 #
-# On branch master
-# Your branch is ahead of 'origin/master' by 1 commit.
-#   (use "git push" to publish your local commits)
-#
-# Changes to be committed:
-#	new file:   tmp.txt
+# ..snip..
 #
 # ------------------------ >8 ------------------------
 # Do not modify or remove the line above.
@@ -141,11 +147,35 @@ index 00000000..ee9808dc
   (comment)
   (comment)
   (comment)
-  (comment (branch))
-  (comment (branch))
   (comment)
   (comment)
-  (comment (summary (header) (change (path))))
+  (comment (scissors))
+  (message)
+  (message)
+  (message)
+  (message)
+  (message)
+  (message)
+  (message)
+  (message))
+
+=====================================
+Commit with scissors cleanup
+=====================================
+tmp
+
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+#
+# Date:      Thu Dec 23 08:06:48 2021 -0600
+# ..snip..
+
+---
+
+(source
+  (subject)
+  (comment (scissors))
+  (comment)
   (comment)
-  (trailer (separator) (trailer_body))
-)
+  (comment))
diff --git a/tree-sitter-gitcommit.wasm b/tree-sitter-gitcommit.wasm
index 687458b..041efe3 100755
Binary files a/tree-sitter-gitcommit.wasm and b/tree-sitter-gitcommit.wasm differ