Исправление конфликта при слиянии

Giorgi · Giorgi · commit 2b93631c7491 · 2025-03-02T23:32:51.000+03:00
diff --git a/f1.txt b/f1.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 file
+=======
+file
+>>>>>>> branch1

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 +<<<<<<< HEAD
 file
 +=======
 +file
 +>>>>>>> branch1