fighting words

pseudogram · pseudogram · commit 22d346d948b5 · 2025-01-25T00:53:30.000-05:00
diff --git a/bar.txt b/bar.txt
@@ -0,0 +1,3 @@
+rab
+
+I'm trying to create a merge conflict with sapling.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+rab`
	`2`	`+`
	`3`	`+I'm trying to create a merge conflict with sapling.`