From 7084f5e1ceb61eab199512410048ad53e3ea08d7 Mon Sep 17 00:00:00 2001
From: Charlie Stanton <charlie@shtanton.xyz>
Date: Tue, 23 Apr 2024 20:25:49 +0100
Subject: Add full merge command

---
 main/lex.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/lex.go')

diff --git a/main/lex.go b/main/lex.go
index 8e66890..da517cc 100644
--- a/main/lex.go
+++ b/main/lex.go
@@ -180,7 +180,7 @@ func lexCommand(l *lexer) stateFunc {
 	case '}':
 		l.emit(TokenRBrace)
 		return lexCommand
-	case 's', 'S':
+	case 's', 'S', 'M':
 		l.emit(TokenCommand)
 		return lexSubstitution
 	case 'x', 'X', 'y', 'Y', 'z', 'Z', 'n', 'N':
-- 
cgit v1.2.3