pseudogram · pseudogram · Jan 25, 2025 · Jan 25, 2025 · Jan 25, 2025 · Jan 25, 2025
diff --git a/bar.txt b/bar.txt
@@ -1,3 +1,4 @@
-rab
+bar
 
 I'm trying to create a merge conflict with sapling.
+I've added this after the fact too.
diff --git a/baz.txt b/baz.txt
@@ -0,0 +1 @@
+baz
diff --git a/flip.txt b/flip.txt
@@ -0,0 +1,4 @@
+flip
+
+now these changes are dependent on flip existing already
+
diff --git a/foo.txt b/foo.txt
@@ -0,0 +1,3 @@
+foo
+
+I added this after committing the original.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		flip

		now these changes are dependent on flip existing already
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		foo

		I added this after committing the original.