From ad0cf4cd1c0ea3893eee3e4839c3f6ad9abe0ce7 Mon Sep 17 00:00:00 2001
From: p3ls <p3ls@intermodi.cc>
Date: Tue, 6 Sep 2022 17:59:41 +0200
Subject: [PATCH] foo

---
 test.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test.txt b/test.txt
index 4609b30..5c76ff9 100644
--- a/test.txt
+++ b/test.txt
@@ -23,3 +23,4 @@ bar
 bla
 =======
 >>>>>>> parent of 73942cd (update)
+bla