tutorial: fix conflict formatting issue

martinvonz · Nov 25, 2024 · ea72a4a · ea72a4a
1 parent 61f0000
commit ea72a4a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -343,8 +343,11 @@ Then run `jj squash` to move the resolution into the conflicted commit.
 $ cat file1
 <<<<<<< Conflict 1 of 1
 %%%%%%% Changes from base to side #1
--b1+a+++++++ Contents of side #2
-b2>>>>>>> Conflict 1 of 1 ends
+-b1
++a
++++++++ Contents of side #2
+b2
+>>>>>>> Conflict 1 of 1 ends
 
 $ echo resolved > file1