Save conflicts

Add numbers
2025-11-25 12:05:07 +03:00 · 2025-11-25 12:03:15 +03:00
1 changed files with 11 additions and 0 deletions
--- a/test.txt
+++ b/test.txt
@@ -1,4 +1,14 @@
 10
+<<<<<<< HEAD
+20
+30
+40
+55
+66
+77
+88
+90
+=======
 21
 31
 41
@@ -7,4 +17,5 @@
 71
 81
 91
+>>>>>>> master
 00
Author	SHA1	Message	Date
Anton Vakhrushev	4de6ab8105	Save conflicts	2025-11-25 12:05:07 +03:00
Anton Vakhrushev	aee2a5dcab	Add numbers	2025-11-25 12:03:15 +03:00