From aef517945b82a358c8bd93bd7824b3210bf2adb8 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.g.taylor@jpmchase.com>
Date: Mon, 25 Nov 2024 14:59:08 -0600
Subject: [PATCH] tutorial: fix conflict formatting issue

---
 docs/tutorial.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial.md b/docs/tutorial.md
index e78cbcb892..57894f4a8a 100644
--- 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