adding bar

pseudogram · pseudogram · commit fc20e6722530 · 2025-01-25T01:25:51.000-05:00
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.

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 -rab
 +bar
 I'm trying to create a merge conflict with sapling.
 +I've added this after the fact too.