From bb9696cd013024ca3916e3bb1a4e3dbb2fd609c1 Mon Sep 17 00:00:00 2001
From: Lunny <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:42:01 +0800
Subject: [PATCH] Fix rebase conflict detection in git 2.26 (#10929)

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index 295d20e5..5e569ee5 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Update docs to 1.11.4 (#10941)
+Fix rebase conflict detection in git 2.26 (#10929)