ivangm-arch · franxiscodev · Sep 18, 2025 · Sep 18, 2025 · Sep 18, 2025 · Sep 20, 2025
diff --git a/dir1/README.md b/dir1/README.md
@@ -0,0 +1,4 @@
+linea nro 1
+la linea dos
+en la 3 digo que solo un par de lineas
+Este es un cambio de prueba para una Pull Request.
diff --git a/dir1/archivo.txt b/dir1/archivo.txt
@@ -0,0 +1,5 @@
+Línea 1
+Línea 2
+Línea 3
+Ultima linea
+Línea 3
diff --git a/dir1/clase1_fichero2.txt b/dir1/clase1_fichero2.txt
diff --git a/dir1/fichero_clase1.txt b/dir1/fichero_clase1.txt
@@ -0,0 +1 @@
+hola mundo 1
diff --git a/dir1/file.txt b/dir1/file.txt
@@ -1 +1 @@
-Fichero de ejemplo
+resuelvo conflicto
diff --git a/dir1/file1.txt b/dir1/file1.txt
diff --git a/dir1/file2.txt b/dir1/file2.txt
diff --git a/dir1/file_mio.txt b/dir1/file_mio.txt
diff --git a/dir1/frutas.txt b/dir1/frutas.txt
@@ -0,0 +1 @@
+banana
diff --git a/dir1/greeting.txt b/dir1/greeting.txt
diff --git a/dir1/hello_world.txt b/dir1/hello_world.txt
@@ -1 +1 @@
-Hello, World!
+HELLO WORLD !!!
diff --git a/nuevo.txt b/nuevo.txt
@@ -0,0 +1,4 @@
+linea 1
+2222222
+linea 3
+4444444
-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    linea 1
+    2222222
+    linea 3
+    4444444