From 5ca7f0b7fef4f174d57fd741b477bbbac0b7886a Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Mon, 14 Jul 2025 20:55:36 +0200
Subject: [PATCH] whitepace: add whitespace to conflict detection marker

closes: #2727

Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 autoload/airline/extensions/whitespace.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim
index 67707b14..618691a4 100644
--- a/autoload/airline/extensions/whitespace.vim
+++ b/autoload/airline/extensions/whitespace.vim
@@ -51,7 +51,8 @@ endfunction
 
 function! s:conflict_marker()
   " Checks for git conflict markers
-  let annotation = '\%([0-9A-Za-z_.:]\+\)\?'
+  " space required for jj conflict marker: #2727
+  let annotation = '\%([0-9A-Za-z_.: ]\+\)\?'
   if match(['rst', 'markdown', 'rmd'], &ft) >= 0
     " rst filetypes use '=======' as header
     let pattern = '^\%(\%(<\{7} '.annotation. '\)\|\%(>\{7\} '.annotation.'\)\)$'