From a585ace6e2becd3a35500cb9b4106a6aae6312a8 Mon Sep 17 00:00:00 2001
From: 1923777848 <1923777848@qq.com>
Date: Wed, 16 Jul 2025 14:05:23 +0800
Subject: [PATCH] 2222

---
 1.txt.orig | 5 +++++
 2.txt      | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 1.txt.orig
 create mode 100644 2.txt

diff --git a/1.txt.orig b/1.txt.orig
new file mode 100644
index 0000000..427664a
--- /dev/null
+++ b/1.txt.orig
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+2222
+=======
+1111
+>>>>>>> 1
diff --git a/2.txt b/2.txt
new file mode 100644
index 0000000..27f29bc
--- /dev/null
+++ b/2.txt
@@ -0,0 +1 @@
+2222
\ No newline at end of file