demos: redact one of the conflict outputs

I would prefer to shorten it, but I ran into #4239
jj-vcs · Aug 8, 2024 · 48eadb8 · 48eadb8
1 parent abfb139
commit 48eadb8
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 66 deletions.
diff --git a/demos/demo_juggle_conflicts.sh b/demos/demo_juggle_conflicts.sh
@@ -25,7 +25,7 @@ run_command "jj diff -r second"
 run_command "jj diff -r third"
 
 comment "Let's reorder the second and third commits:"
-run_command "jj rebase -s third -d first"
+run_command_output_redacted "jj rebase -s third -d first"
 run_command "jj rebase -s second -d third"
 run_command "jj log"
 comment "The commit labeled \"third\" has a conflict, as expected. What's more