From 0d1d548032420c0e7daccfe14bc2fed18775d797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Mon, 22 Feb 2021 18:11:50 +0100
Subject: tokenize and report git conflict markers

---
 src/tokenizer.rs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/tokenizer.rs')

diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index b54e194..2c8e5e8 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -127,6 +127,11 @@ pub enum Token {
     #[token("\n")]
     Newline,
 
+    #[token("<<<<<<<")]
+    GitConflictBegin,
+    #[token(">>>>>>>")]
+    GitConflictEnd,
+
     #[regex(r"//[^\n]*", logos::skip)]
     Comment,
 
-- 
cgit v1.2.1