merge

1 month ago · 58c7c2b6be
3 changed files with 15 additions and 3 deletions
--- a/file1.txt
+++ b/file1.txt
@ -1 +1,5 @@
 file 1 branch 2
 <<<<<<< HEAD
 file 1
 =======
 file 1
 >>>>>>> branch1
--- a/file2.txt
+++ b/file2.txt
@ -1 +1,5 @@
 file 2 branch 2
 <<<<<<< HEAD
 file 2
 =======
 file 2
 >>>>>>> branch1
--- a/file3.txt
+++ b/file3.txt
@ -1 +1,5 @@
 file 3 branch 2
 <<<<<<< HEAD
 file 3
 =======
 file 3
 >>>>>>> branch1