We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 347429b commit 28bd74dCopy full SHA for 28bd74d
bar.txt
@@ -1,3 +1,4 @@
1
-rab
+bar
2
3
I'm trying to create a merge conflict with sapling.
4
+I've added this after the fact too.
0 commit comments